[llvm-branch-commits] [llvm-gcc-branch] r96929 - in /llvm-gcc-4.2/branches/Apple/Hermes/gcc: c-lang.c cp/cp-lang.c cp/parser.c

[Bill Wendling]

Author: void
Date: Tue Feb 23 03:08:02 2010
New Revision: 96929

URL: http://llvm.org/viewvc/llvm-project?rev=96929&view=rev
Log:
$ svn merge -c -96793 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/branches/Apple/Hermes
--- Reverse-merging r96793 into '.':
U    gcc/cp/cp-lang.c
U    gcc/cp/parser.c
U    gcc/c-lang.c

Modified:
    llvm-gcc-4.2/branches/Apple/Hermes/gcc/c-lang.c
    llvm-gcc-4.2/branches/Apple/Hermes/gcc/cp/cp-lang.c
    llvm-gcc-4.2/branches/Apple/Hermes/gcc/cp/parser.c

Modified: llvm-gcc-4.2/branches/Apple/Hermes/gcc/c-lang.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Hermes/gcc/c-lang.c?rev=96929&r1=96928&r2=96929&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Hermes/gcc/c-lang.c (original)
+++ llvm-gcc-4.2/branches/Apple/Hermes/gcc/c-lang.c Tue Feb 23 03:08:02 2010
@@ -88,11 +88,6 @@
 void
 finish_file (void)
 {
-  /* APPLE LOCAL begin radar 4874613 */
-  /* Bad parse errors.  Just forget about it.  */
-  if (!errorcount && !sorrycount && pch_file)
-    c_common_write_pch ();
-  /* APPLE LOCAL end radar 4874613 */
 }
 
 #include "gtype-c.h"

Modified: llvm-gcc-4.2/branches/Apple/Hermes/gcc/cp/cp-lang.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Hermes/gcc/cp/cp-lang.c?rev=96929&r1=96928&r2=96929&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Hermes/gcc/cp/cp-lang.c (original)
+++ llvm-gcc-4.2/branches/Apple/Hermes/gcc/cp/cp-lang.c Tue Feb 23 03:08:02 2010
@@ -149,12 +149,6 @@
 finish_file (void)
 {
   cp_finish_file ();
-  /* APPLE LOCAL begin radar 4874613 */
-  /* Bad parse errors.  Just forget about it.  */
-  if (pch_file && lang_hooks.decls.global_bindings_p () &&
-      !current_class_type && !decl_namespace_list)
-    c_common_write_pch ();
-  /* APPLE LOCAL end radar 4874613 */
 }
 
 #include "gtype-cp.h"

Modified: llvm-gcc-4.2/branches/Apple/Hermes/gcc/cp/parser.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Hermes/gcc/cp/parser.c?rev=96929&r1=96928&r2=96929&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Hermes/gcc/cp/parser.c (original)
+++ llvm-gcc-4.2/branches/Apple/Hermes/gcc/cp/parser.c Tue Feb 23 03:08:02 2010
@@ -23492,6 +23492,13 @@
 				? dk_no_deferred : dk_no_check);
   error_occurred = cp_parser_translation_unit (the_parser);
   the_parser = NULL;
+  /* APPLE LOCAL begin radar 4874613 */
+  /* Bad parse errors.  Just forget about it.  */
+  if (! global_bindings_p () || current_class_type || decl_namespace_list)
+    return;
+  if (pch_file)
+    c_common_write_pch ();
+  /* APPLE LOCAL end radar 4874613 */
 }
 
 /* This variable must be provided by every front end.  */