aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/constexpr.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2020-05-28 00:35:56 -0400
committerJason Merrill <jason@redhat.com>2020-05-28 14:58:16 -0400
commit7b599b9f9a1e036ff75a4daa06ac7036c6ebbe01 (patch)
tree32f368ca47633fad4cba5936700a702f83585b9b /gcc/cp/constexpr.c
parentc83027f32d9cca84959c7d6a1e519a0129731501 (diff)
downloadgcc-7b599b9f9a1e036ff75a4daa06ac7036c6ebbe01.zip
gcc-7b599b9f9a1e036ff75a4daa06ac7036c6ebbe01.tar.gz
gcc-7b599b9f9a1e036ff75a4daa06ac7036c6ebbe01.tar.bz2
c++: Immediately deduce auto member [PR94926].
In r9-297 I was trying to be more flexible and treat static data members of class templates more like variable templates, where the type need not be determined until the variable is instantiated, but I suppose that in a class the types of all the non-template members need to be determined at the time of class instantiation. gcc/cp/ChangeLog: PR c++/94926 * decl.c (cp_finish_decl): Revert r9-297 change. (check_static_variable_definition): Likewise. * constexpr.c (ensure_literal_type_for_constexpr_object): Likewise. * pt.c (instantiate_decl): Return early on type error. gcc/testsuite/ChangeLog: * g++.dg/cpp1z/pr86648.C: Expect error. * g++.dg/cpp1z/static2.C: Expect error. * g++.dg/cpp0x/nsdmi16.C: New test.
Diffstat (limited to 'gcc/cp/constexpr.c')
-rw-r--r--gcc/cp/constexpr.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 4e441ac..4b1f92f 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -96,8 +96,6 @@ ensure_literal_type_for_constexpr_object (tree decl)
if (CLASS_TYPE_P (stype) && !COMPLETE_TYPE_P (complete_type (stype)))
/* Don't complain here, we'll complain about incompleteness
when we try to initialize the variable. */;
- else if (type_uses_auto (type))
- /* We don't know the actual type yet. */;
else if (!literal_type_p (type))
{
if (DECL_DECLARED_CONSTEXPR_P (decl))