re PR c++/10381 (Accepts call to inexistent function)

	PR c++/10381
	* parser.c (cp_parser_primary_expression): Reorganize logic for
	dealing with name lookup failures.

	PR c++/10381
	* g++.dg/parse/lookup3.C: New test.

From-SVN: r65656

gcc/cp/ChangeLog

+2003-04-15  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/10381
+	* parser.c (cp_parser_primary_expression): Reorganize logic for
+	dealing with name lookup failures.
+
 2003-04-15  Jason Merrill  <jason@redhat.com>
 
 	* decl2.c (mark_used): Don't instantiate anything if

gcc/cp/parser.c

@@ -2558,8 +2558,10 @@ cp_parser_primary_expression (cp_parser *parser,
 		  }
 	      }
 
+	    if (decl == error_mark_node)
+	      {
+		/* Name lookup failed.  */
 		if (!parser->scope 
-		&& decl == error_mark_node
 		    && processing_template_decl)
 		  {
 		    /* Unqualified name lookup failed while processing a
@@ -2574,27 +2576,34 @@ cp_parser_primary_expression (cp_parser *parser,
 		    error ("`%D' has not been declared", id_expression);
 		    return error_mark_node;
 		  }
-	    else if (decl == error_mark_node
-		     && !processing_template_decl)
-	      {
-		if (!parser->scope)
+		else if (parser->scope
+			 && (!TYPE_P (parser->scope)
+			     || !dependent_type_p (parser->scope)))
 		  {
-		    /* It may be resolvable as a koenig lookup function
-		       call.  */
-		    *idk = CP_PARSER_ID_KIND_UNQUALIFIED;
-		    return id_expression;
-		  }
-		else if (TYPE_P (parser->scope)
+		    /* Qualified name lookup failed, and the
+		       qualifying name was not a dependent type.  That
+		       is always an error.  */
+		    if (TYPE_P (parser->scope)
 			&& !COMPLETE_TYPE_P (parser->scope))
-		  error ("incomplete type `%T' used in nested name specifier",
+		      error ("incomplete type `%T' used in nested name "
+			     "specifier",
 			     parser->scope);
 		    else if (parser->scope != global_namespace)
 		      error ("`%D' is not a member of `%D'",
 			     id_expression, parser->scope);
 		    else
 		      error ("`::%D' has not been declared", id_expression);
+		    return error_mark_node;
+		  }
+		else if (!parser->scope && !processing_template_decl)
+		  {
+		    /* It may be resolvable as a koenig lookup function
+		       call.  */
+		    *idk = CP_PARSER_ID_KIND_UNQUALIFIED;
+		    return id_expression;
+		  }
 	      }
-	    /* If DECL is a variable would be out of scope under
+	    /* If DECL is a variable that would be out of scope under
 	       ANSI/ISO rules, but in scope in the ARM, name lookup
 	       will succeed.  Issue a diagnostic here.  */
 	    else

gcc/testsuite/ChangeLog

+2003-04-15  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/10381
+	* g++.dg/parse/lookup3.C: New test.
+
 2003-04-15  J"orn Rennecke <joern.rennecke@superh.com>
 
 	* gcc.c-torture/compile/20030415-1.c : New test.

gcc/testsuite/g++.dg/parse/lookup3.C

+struct X {};
+
+template <int>
+struct Base {
+    static void foo () { 
+      X::NONEXISTENT (); // { dg-error "" }
+    }
+};
+
+int main () {
+  Base<2>::foo ();
+}

gcc/testsuite/lib/prune.exp

@@ -19,7 +19,7 @@
 proc prune_gcc_output { text } {
     #send_user "Before:$text\n"
 
-    regsub -all "(^|\n)\[^\n\]*: In (function|member|method|(copy )?constructor|instantiation|program|subroutine|block-data) \[^\n\]*" $text "" text
+    regsub -all "(^|\n)\[^\n\]*: In ((static member )?function|member|method|(copy )?constructor|instantiation|program|subroutine|block-data) \[^\n\]*" $text "" text
     regsub -all "(^|\n)\[^\n\]*: At (top level|global scope):\[^\n\]*" $text "" text
     regsub -all "(^|\n)collect2: ld returned \[^\n\]*" $text "" text
     regsub -all "(^|\n)Please submit.*instructions\[^\n\]*" $text "" text