pt.c (convert_nontype_argument): Check against type_referred_to.

~
1998-10-14 Benjamin Kosnik  <bkoz@rhino.cygnus.com>
        * pt.c (convert_nontype_argument): Check against type_referred_to.
        * decl.c (grokvardecl): Check for declarator name before building
        DECL_ASSEMBLER_NAME.

From-SVN: r23097

gcc/cp/ChangeLog

+1998-10-14 Benjamin Kosnik  <bkoz@rhino.cygnus.com>
+
+	* pt.c (convert_nontype_argument): Check against type_referred_to.
+        * decl.c (grokvardecl): Check for declarator name before building
+	DECL_ASSEMBLER_NAME.
+	 
 1998-10-14  Mark Mitchell  <mark@markmitchell.com>
 
 	* pt.c (lookup_template_class): Add comment.

gcc/cp/decl.c

@@ -8273,7 +8273,7 @@ grokvardecl (type, declarator, specbits_in, initialized, constp, in_namespace)
     {
       tree context = in_namespace ? in_namespace : current_namespace;
       decl = build_decl (VAR_DECL, declarator, complete_type (type));
-      if (context != global_namespace && namespace_bindings_p ()
+      if (declarator && context != global_namespace && namespace_bindings_p ()
 	  && current_lang_name != lang_name_c)
 	DECL_ASSEMBLER_NAME (decl) =  build_static_name (context,
 							 declarator);

gcc/cp/pt.c

@@ -2583,7 +2583,7 @@ convert_nontype_argument (type, expr)
 	    if (fn == error_mark_node)
 	      return error_mark_node;
 
-	    my_friendly_assert (comptypes (type, TREE_TYPE (fn), 1),
+	    my_friendly_assert (comptypes (type_referred_to, TREE_TYPE (fn), 1),
 				0);
 
 	    return fn;