diff options
| author | Nathaniel Shead <nathanieloshead@gmail.com> | 2024-01-03 09:28:43 +1100 |
|---|---|---|
| committer | Nathaniel Shead <nathanieloshead@gmail.com> | 2024-01-07 21:07:29 +1100 |
| commit | a71c3977d24722ac8ee28d8844c4f96a151f75ab (patch) | |
| tree | 4f1372e33971edda54b2581d05e963b9a4918c84 /gcc | |
| parent | 63b531e6f8783e8624502d890dc422379de47a9a (diff) | |
| download | gcc-a71c3977d24722ac8ee28d8844c4f96a151f75ab.zip gcc-a71c3977d24722ac8ee28d8844c4f96a151f75ab.tar.gz gcc-a71c3977d24722ac8ee28d8844c4f96a151f75ab.tar.bz2 | |
c++: Fix ICE when writing nontrivial variable initializers
The attached testcase Patrick found in PR c++/112899 ICEs because it is
attempting to write a variable initializer that is no longer in the
static_aggregates map.
The issue is that, for non-header modules, the loop in
c_parse_final_cleanups prunes the static_aggregates list, which means
that by the time we get to emitting module information those
initialisers have been lost.
However, we don't actually need to write non-trivial initialisers for
non-header modules, because they've already been emitted as part of the
module TU itself. Instead let's just only write the initializers from
header modules (which skipped writing them in c_parse_final_cleanups).
gcc/cp/ChangeLog:
* module.cc (trees_out::write_var_def): Only write initializers
in header modules.
gcc/testsuite/ChangeLog:
* g++.dg/modules/init-5_a.C: New test.
* g++.dg/modules/init-5_b.C: New test.
Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/module.cc | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/modules/init-5_a.C | 9 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/modules/init-5_b.C | 10 |
3 files changed, 21 insertions, 1 deletions
diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index e0759a9..9bb6d26 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -11707,7 +11707,8 @@ trees_out::write_var_def (tree decl) { tree dyn_init = NULL_TREE; - if (DECL_NONTRIVIALLY_INITIALIZED_P (decl)) + /* We only need to write initializers in header modules. */ + if (header_module_p () && DECL_NONTRIVIALLY_INITIALIZED_P (decl)) { dyn_init = value_member (decl, CP_DECL_THREAD_LOCAL_P (decl) diff --git a/gcc/testsuite/g++.dg/modules/init-5_a.C b/gcc/testsuite/g++.dg/modules/init-5_a.C new file mode 100644 index 0000000..466b120 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/init-5_a.C @@ -0,0 +1,9 @@ +// { dg-additional-options "-fmodules-ts" } +// { dg-module-cmi M } + +export module M; + +export struct A { + static int f() { return -1; } + static inline int x = f(); +}; diff --git a/gcc/testsuite/g++.dg/modules/init-5_b.C b/gcc/testsuite/g++.dg/modules/init-5_b.C new file mode 100644 index 0000000..40973cc --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/init-5_b.C @@ -0,0 +1,10 @@ +// { dg-module-do run } +// { dg-additional-options "-fmodules-ts" } + +import M; + +int main() { + const int& x = A::x; + if (x != -1) + __builtin_abort(); +} |