diff options
Diffstat (limited to 'gcc/cp/name-lookup.c')
| -rw-r--r-- | gcc/cp/name-lookup.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index add0d55d405..624e86e24f1 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -435,10 +435,13 @@ supplement_binding (cxx_binding *binding, tree decl) if (TREE_CODE (decl) == TYPE_DECL && DECL_ARTIFICIAL (decl)) /* The new name is the type name. */ binding->type = decl; - else if (!bval) - /* This situation arises when push_class_level_binding moves an - inherited type-binding out of the way to make room for a new - value binding. */ + else if (!bval || bval == error_mark_node) + /* VALUE is null when push_class_level_binding moves an inherited + type-binding out of the way to make room for a new value binding. + It is an error_mark_node when DECL's name has been used in a + non-class scope prior declaration. In that case, we should have + already issued a diagnostic; for graceful error recovery purpose, + pretend this was the intended declaration for that name. */ binding->value = decl; else if (TREE_CODE (bval) == TYPE_DECL && DECL_ARTIFICIAL (bval)) { |