From b671b4570d08d32958b774ac3c384869a327cb0d Mon Sep 17 00:00:00 2001 From: Lee Millward Date: Tue, 11 Jul 2006 17:37:31 +0000 Subject: [PATCH] re PR c++/28051 (ICE on invalid conversion operator) PR c++/28051 * mangle.c (mangle_conv_op_name_for_type): Check for invalid types. * name-lookup.c (push_class_level_binding): Robustify. (do_class_using_decl): Return early if name is error_mark_node. From-SVN: r115352 --- gcc/cp/ChangeLog | 9 +++++++++ gcc/cp/mangle.c | 3 +++ gcc/cp/name-lookup.c | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/template/using10.C | 11 +++++++++++ 5 files changed, 34 insertions(+) create mode 100644 gcc/testsuite/g++.dg/template/using10.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7f2996a5a135..b841f4ab118d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2006-07-11 Lee Millward + + PR c++/28051 + * mangle.c (mangle_conv_op_name_for_type): Check for + invalid types. + * name-lookup.c (push_class_level_binding): Robustify. + (do_class_using_decl): Return early if name is + error_mark_node. + 2006-07-10 Jason Merrill * class.c (check_field_decls): Fix warning call. diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index be1112f81164..feac3e28a762 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -2771,6 +2771,9 @@ mangle_conv_op_name_for_type (const tree type) void **slot; tree identifier; + if (type == error_mark_node) + return error_mark_node; + if (conv_type_names == NULL) conv_type_names = htab_create_ggc (31, &hash_type, &compare_type, NULL); diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index 2d71f3bfa11c..fb527e2b0fc4 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -2556,6 +2556,9 @@ push_class_level_binding (tree name, tree x) if (!class_binding_level) POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, true); + if (name == error_mark_node) + POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, false); + /* Check for invalid member names. */ gcc_assert (TYPE_BEING_DEFINED (current_class_type)); /* We could have been passed a tree list if this is an ambiguous @@ -2695,6 +2698,9 @@ tree do_class_using_decl (tree scope, tree name) { tree value, type; + + if (name == error_mark_node) + return NULL_TREE; if (!scope || !TYPE_P (scope)) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f4c458402011..232732f78dd9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-07-11 Lee Millward + + PR c++/28051 + * g++.dg/template/using10.C: New test. + 2006-07-08 Lee Millward PR c++/27820 diff --git a/gcc/testsuite/g++.dg/template/using10.C b/gcc/testsuite/g++.dg/template/using10.C new file mode 100644 index 000000000000..ceed63f9265e --- /dev/null +++ b/gcc/testsuite/g++.dg/template/using10.C @@ -0,0 +1,11 @@ +//PR c++/28051 + +template struct A {}; + +template struct B : A +{ + using A::operator typename A::X; // { dg-error "no type named" } +}; + +B<0> b; + -- 2.47.2