Commit 962c5679 by Jakub Jelinek Committed by Jakub Jelinek

re PR c++/78890 (ICE on invalid reference type in union)

	PR c++/78890
	* class.c (check_field_decls): Diagnose REFERENCE_TYPE fields in
	unions even for C++11 and later.

	* g++.dg/init/ref14.C: Expect error even in C++11 and later.
	* g++.dg/init/union1.C: Likewise.
	* g++.dg/cpp0x/union6.C: Expect errors.
	* g++.dg/cpp0x/union8.C: New test.
	* g++.dg/cpp0x/pr78890-1.C: New test.
	* g++.dg/cpp0x/pr78890-2.C: New test.

From-SVN: r244112
parent 8c15f541
2017-01-05 Jakub Jelinek <jakub@redhat.com>
PR c++/78890
* class.c (check_field_decls): Diagnose REFERENCE_TYPE fields in
unions even for C++11 and later.
2017-01-05 Nathan Sidwell <nathan@acm.org> 2017-01-05 Nathan Sidwell <nathan@acm.org>
PR c++/78765 PR c++/78765
......
...@@ -3759,25 +3759,27 @@ check_field_decls (tree t, tree *access_decls, ...@@ -3759,25 +3759,27 @@ check_field_decls (tree t, tree *access_decls,
/* When this goes into scope, it will be a non-local reference. */ /* When this goes into scope, it will be a non-local reference. */
DECL_NONLOCAL (x) = 1; DECL_NONLOCAL (x) = 1;
if (TREE_CODE (t) == UNION_TYPE if (TREE_CODE (t) == UNION_TYPE)
&& cxx_dialect < cxx11)
{ {
/* [class.union] (C++98) /* [class.union] (C++98)
If a union contains a static data member, or a member of If a union contains a static data member, or a member of
reference type, the program is ill-formed. reference type, the program is ill-formed.
In C++11 this limitation doesn't exist anymore. */ In C++11 [class.union] says:
if (VAR_P (x)) If a union contains a non-static data member of reference type
the program is ill-formed. */
if (VAR_P (x) && cxx_dialect < cxx11)
{ {
error ("in C++98 %q+D may not be static because it is " error ("in C++98 %q+D may not be static because it is "
"a member of a union", x); "a member of a union", x);
continue; continue;
} }
if (TREE_CODE (type) == REFERENCE_TYPE) if (TREE_CODE (type) == REFERENCE_TYPE
&& TREE_CODE (x) == FIELD_DECL)
{ {
error ("in C++98 %q+D may not have reference type %qT " error ("non-static data member %q+D in a union may not "
"because it is a member of a union", x, type); "have reference type %qT", x, type);
continue; continue;
} }
} }
......
2017-01-05 Jakub Jelinek <jakub@redhat.com>
PR c++/78890
* g++.dg/init/ref14.C: Expect error even in C++11 and later.
* g++.dg/init/union1.C: Likewise.
* g++.dg/cpp0x/union6.C: Expect errors.
* g++.dg/cpp0x/union8.C: New test.
* g++.dg/cpp0x/pr78890-1.C: New test.
* g++.dg/cpp0x/pr78890-2.C: New test.
2017-01-05 David Edelsohn <dje.gcc@gmail.com> 2017-01-05 David Edelsohn <dje.gcc@gmail.com>
* gcc.target/powerpc/pr71670.c: Require p9vector. * gcc.target/powerpc/pr71670.c: Require p9vector.
......
// PR c++/78890
// { dg-do compile { target c++11 } }
int
main()
{
union {
int a;
int &b = a; // { dg-error "may not have reference type" }
};
a = 1;
auto c = b + 1;
}
// PR c++/78890
// { dg-do compile { target c++11 } }
template <typename T>
int
foo ()
{
union {
int a;
int &b = a; // { dg-error "may not have reference type" }
};
a = 1;
auto c = b + 1;
return c;
}
template <typename T>
T
bar ()
{
union {
T a;
T &b = a; // { dg-error "may not have reference type" }
};
a = 1;
auto c = b + 1;
return c;
}
template <typename T, typename U>
T baz()
{
union {
T a;
U b = a; // { dg-error "may not have reference type" }
};
a = 1;
auto c = b + 1;
return c;
}
int a = foo<int> ();
int b = bar<int> ();
int c = baz<int, int &> ();
...@@ -12,9 +12,9 @@ union Test2 { ...@@ -12,9 +12,9 @@ union Test2 {
const int Test2::kConstant = 10; const int Test2::kConstant = 10;
union Test3 { union Test3 {
int& kConstant; int& kConstant; // { dg-error "may not have reference type" }
}; };
union Test4 { union Test4 {
const int& kConstant = 10; const int& kConstant = 10; // { dg-error "may not have reference type" }
}; };
// PR c++/78890
// { dg-do compile { target c++11 } }
union Test1 {
static int kConstant;
};
union Test2 {
static const int kConstant;
};
const int Test2::kConstant = 10;
int k;
union Test3 {
static int& kRef;
};
int& Test3::kRef = k;
union Test4 {
static const int& kRef;
};
const int& Test4::kRef = 10;
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
union A union A
{ {
int &i; // { dg-error "may not have reference type" "" { target { ! c++11 } } } int &i; // { dg-error "may not have reference type" }
}; };
void foo() void foo()
......
// PR c++/14401 // PR c++/14401
union U { union U {
int& i; // { dg-error "reference type" "" { target { ! c++11 } } } int& i; // { dg-error "reference type" }
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment