diff options
Diffstat (limited to 'gcc/cp/decl.c')
-rw-r--r-- | gcc/cp/decl.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index d1af63e..5e17e4d 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -692,8 +692,18 @@ poplevel (int keep, int reverse, int functionbody) /* Remove declarations for all the DECLs in this level. */ for (link = decls; link; link = TREE_CHAIN (link)) { - decl = TREE_CODE (link) == TREE_LIST ? TREE_VALUE (link) : link; - tree name = OVL_NAME (decl); + tree name; + if (TREE_CODE (link) == TREE_LIST) + { + decl = TREE_VALUE (link); + name = TREE_PURPOSE (link); + gcc_checking_assert (name); + } + else + { + decl = link; + name = DECL_NAME (decl); + } /* Remove the binding. */ if (TREE_CODE (decl) == LABEL_DECL) |