[llvm-commits] CVS: llvm-gcc/gcc/cp/parser.c

[Chris Lattner]

Changes in directory llvm-gcc/gcc/cp:

parser.c updated: 1.1.1.2 -> 1.2
---
Log message:

Merge in this patch:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/cp/parser.c.diff?cvsroot=gcc&r1=1.126&r2=1.127

to fix PR447: http://llvm.cs.uiuc.edu/PR447 /GCC PR13166: http://llvm.cs.uiuc.edu/PR13166 

Testcase here: test/Regression/C++Frontend/2004-11-27-FriendDefaultArgCrash.cpp



---
Diffs of the changes:  (+2 -2)

Index: llvm-gcc/gcc/cp/parser.c
diff -u llvm-gcc/gcc/cp/parser.c:1.1.1.2 llvm-gcc/gcc/cp/parser.c:1.2
--- llvm-gcc/gcc/cp/parser.c:1.1.1.2	Tue Jan 13 10:49:38 2004
+++ llvm-gcc/gcc/cp/parser.c	Sat Nov 27 19:23:05 2004
@@ -13935,10 +13935,10 @@
       saved_local_variables_forbidden_p = parser->local_variables_forbidden_p;
       parser->local_variables_forbidden_p = true;
        /* Parse the assignment-expression.  */
-      if (DECL_CONTEXT (fn))
+      if (DECL_CLASS_SCOPE_P (fn))
 	push_nested_class (DECL_CONTEXT (fn));
       TREE_PURPOSE (parameters) = cp_parser_assignment_expression (parser);
-      if (DECL_CONTEXT (fn))
+      if (DECL_CLASS_SCOPE_P (fn))
 	pop_nested_class ();
 
        /* Restore saved state.  */