diff options
| author | Benjamin Kosnik <bkoz@rhino.cygnus.com> | 1998-10-14 21:16:37 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 1998-10-14 21:16:37 +0000 |
| commit | 5b2e9bf44d3ef44eff617b1ac5fe36eed898815c (patch) | |
| tree | 4a04bd4bc057a9e6843db25b71ae13bd17a3eb33 | |
| parent | 7f94849f0cee7a4b48c49675a0c33d02964c2889 (diff) | |
| download | gcc-5b2e9bf44d3ef44eff617b1ac5fe36eed898815c.zip gcc-5b2e9bf44d3ef44eff617b1ac5fe36eed898815c.tar.gz gcc-5b2e9bf44d3ef44eff617b1ac5fe36eed898815c.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0e5b319..b98eb82 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +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. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 90b2e53..8d9337f 100644 --- a/gcc/cp/decl.c +++ b/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); diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c836fbd..c3e2d2e 100644 --- a/gcc/cp/pt.c +++ b/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; |