re PR c++/27933 (ICE with invalid "using")

	PR c++/27933
	* name-lookup.c (lookup_qualified_name): Always return error_mark_node
	if lookup fails.

	* g++.dg/lookup/using15.C: New test.

From-SVN: r114580

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b1ed4f08446e78b1e07eb1c7f722052e3a02f979..9bc98238566c37d0fa0757aa9a38836e9a04e33e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2006-06-12  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+       PR c++/27933
+       * name-lookup.c (lookup_qualified_name): Always return error_mark_node
+       if lookup fails.
+
        PR c++/27951
        * decl2.c (finish_anon_union): Return early if build_anon_union_vars
        fails.

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index bf835d7df776e372c468601f94c6f123edbde4c0..187a41f5a9ffa5a01e958a04bfb5d7600cf432e3 100644 (file)
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -3713,6 +3713,7 @@ tree
 lookup_qualified_name (tree scope, tree name, bool is_type_p, bool complain)
 {
   int flags = 0;
+  tree t = NULL_TREE;
 
   if (TREE_CODE (scope) == NAMESPACE_DECL)
     {
@@ -3722,17 +3723,14 @@ lookup_qualified_name (tree scope, tree name, bool is_type_p, bool complain)
       if (is_type_p)
        flags |= LOOKUP_PREFER_TYPES;
       if (qualified_lookup_using_namespace (name, scope, &binding, flags))
-       return select_decl (&binding, flags);
+       t = select_decl (&binding, flags);
     }
   else if (is_aggr_type (scope, complain))
-    {
-      tree t;
-      t = lookup_member (scope, name, 2, is_type_p);
-      if (t)
-       return t;
-    }
+    t = lookup_member (scope, name, 2, is_type_p);
 
-  return error_mark_node;
+  if (!t)
+    return error_mark_node;
+  return t;
 }
 
 /* Subroutine of unqualified_namespace_lookup:

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b43e5191ccb8b3f7a6898537b3f258b762e59753..4b23d39c35c767d1bf56e88e1a086492aa1e3152 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-12  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+       PR c++/27933
+       * g++.dg/lookup/using15.C: New test.
+
        PR c++/27951
        * g++.dg/other/anon4.C: New test.
 

diff --git a/gcc/testsuite/g++.dg/lookup/using15.C b/gcc/testsuite/g++.dg/lookup/using15.C
new file mode 100644 (file)
index 0000000..b5ca3a8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/using15.C
@@ -0,0 +1,10 @@
+// PR c++/27933
+// { dg-do compile }
+
+template<int> struct A
+{
+  int i;
+  A() { using i; }  // { dg-error "nested-name-specifier|declared" }
+};
+
+A<0> a;