Tested x86_64-pc-linux-gnu, applying to trunk.
-- 8< --
We weren't writing out the definition of an inline variable, so the importer
either got an undefined symbol or 0.
gcc/cp/ChangeLog:
* module.cc (has_definition): Also true for inline vars.
gcc/testsuite/ChangeLog:
* g++.dg/modules/inline-1_a.C: New test.
* g++.dg/modules/inline-1_b.C: New test.
---
gcc/cp/module.cc | 3 ++-
gcc/testsuite/g++.dg/modules/inline-1_a.C | 11 +++++++++++
gcc/testsuite/g++.dg/modules/inline-1_b.C | 8 ++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/g++.dg/modules/inline-1_a.C
create mode 100644 gcc/testsuite/g++.dg/modules/inline-1_b.C
diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc
index 3b25f956928..617bf4c68b1 100644
--- a/gcc/cp/module.cc
+++ b/gcc/cp/module.cc
@@ -11919,7 +11919,8 @@ has_definition (tree decl)
since there's no TU to emit them in otherwise. */
return true;
- if (!decl_maybe_constant_var_p (decl))
+ if (!decl_maybe_constant_var_p (decl)
+ && !DECL_INLINE_VAR_P (decl))
return false;
return true;
diff --git a/gcc/testsuite/g++.dg/modules/inline-1_a.C
b/gcc/testsuite/g++.dg/modules/inline-1_a.C
new file mode 100644
index 00000000000..eafd450e667
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/inline-1_a.C
@@ -0,0 +1,11 @@
+// { dg-additional-options -fmodules }
+// { dg-module-do run }
+export module M;
+
+inline int b = 42;
+struct A
+{
+ static inline int a = 4200;
+};
+
+export inline int f() { return b+A::a; }
diff --git a/gcc/testsuite/g++.dg/modules/inline-1_b.C
b/gcc/testsuite/g++.dg/modules/inline-1_b.C
new file mode 100644
index 00000000000..af319b16071
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/inline-1_b.C
@@ -0,0 +1,8 @@
+// { dg-additional-options -fmodules }
+import M;
+
+int main()
+{
+ if (f() != 4242)
+ __builtin_abort ();
+}
base-commit: 806563f11eb7a677468f0ef40864da6f749b05a8
prerequisite-patch-id: 31e3d047a448e14e52ee30721009e58feb3633e3
prerequisite-patch-id: 020aa4f96c4f50df4217a2c23667256a12b3f149
--
2.47.0
