diff options
| author | Nathaniel Shead <nathanieloshead@gmail.com> | 2024-09-12 20:06:39 +1000 |
|---|---|---|
| committer | Nathaniel Shead <nathanieloshead@gmail.com> | 2024-09-27 13:49:23 +1000 |
| commit | 1a0b33ebc57ebcc9595b19050f5c36c1f9d39e3e (patch) | |
| tree | 5b0544ee90a41cf709e7812d8fd1dc4cc247ae21 /gcc | |
| parent | d0762e93ce1ed046e1dd9477ebe0ad941c298677 (diff) | |
| download | gcc-1a0b33ebc57ebcc9595b19050f5c36c1f9d39e3e.zip gcc-1a0b33ebc57ebcc9595b19050f5c36c1f9d39e3e.tar.gz gcc-1a0b33ebc57ebcc9595b19050f5c36c1f9d39e3e.tar.bz2 | |
c++/modules: Allow imported references in constant expressions
Currently the streaming code uses TREE_CONSTANT to determine whether an
entity will have a definition that is interesting to stream out. This
is not sufficient, however; we also need to write the definition of
references, since although not TREE_CONSTANT they can still be usable in
constant expressions.
As such this patch uses the existing decl_maybe_constant_var function
which correctly handles this case.
gcc/cp/ChangeLog:
* module.cc (has_definition): Use decl_maybe_constant_var
instead of TREE_CONSTANT.
gcc/testsuite/ChangeLog:
* g++.dg/modules/cexpr-5_a.C: New test.
* g++.dg/modules/cexpr-5_b.C: New test.
Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>
Reviewed-by: Jason Merrill <jason@redhat.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/module.cc | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/modules/cexpr-5_a.C | 13 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/modules/cexpr-5_b.C | 9 |
3 files changed, 23 insertions, 1 deletions
diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index f5df9e8..65b37b4 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -11829,7 +11829,7 @@ has_definition (tree decl) since there's no TU to emit them in otherwise. */ return true; - if (!TREE_CONSTANT (decl)) + if (!decl_maybe_constant_var_p (decl)) return false; return true; diff --git a/gcc/testsuite/g++.dg/modules/cexpr-5_a.C b/gcc/testsuite/g++.dg/modules/cexpr-5_a.C new file mode 100644 index 0000000..3a9f005 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/cexpr-5_a.C @@ -0,0 +1,13 @@ +// { dg-additional-options "-fmodules-ts" } +// { dg-module-cmi M } + +export module M; + +int x = 123; +void f() {} + +int& xr = x; +auto& fr = f; + +constexpr int& cxr = xr; +constexpr auto& cfr = fr; diff --git a/gcc/testsuite/g++.dg/modules/cexpr-5_b.C b/gcc/testsuite/g++.dg/modules/cexpr-5_b.C new file mode 100644 index 0000000..4b1b901 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/cexpr-5_b.C @@ -0,0 +1,9 @@ +// { dg-additional-options "-fmodules-ts" } + +module M; + +constexpr auto& use_xr = xr; +constexpr auto& use_fr = fr; + +static_assert(&cxr == &use_xr); +static_assert(&cfr == &use_fr); |