aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/class.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/cp/class.c')
-rw-r--r--gcc/cp/class.c25
1 files changed, 4 insertions, 21 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 28cf7dc..a5f1007 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -7709,27 +7709,10 @@ outermost_open_class (void)
tree
current_nonlambda_class_type (void)
{
- int i;
-
- /* We start looking from 1 because entry 0 is from global scope,
- and has no type. */
- for (i = current_class_depth; i > 0; --i)
- {
- tree c;
- if (i == current_class_depth)
- c = current_class_type;
- else
- {
- if (current_class_stack[i].hidden)
- break;
- c = current_class_stack[i].type;
- }
- if (!c)
- continue;
- if (!LAMBDA_TYPE_P (c))
- return c;
- }
- return NULL_TREE;
+ tree type = current_class_type;
+ while (type && LAMBDA_TYPE_P (type))
+ type = decl_type_context (TYPE_NAME (type));
+ return type;
}
/* When entering a class scope, all enclosing class scopes' names with