[llvm-branch-commits] [llvm-gcc-branch] r104548 - /llvm-gcc-4.2/branches/Apple/Morbo/gcc/tree.c

[Dale Johannesen]

Author: johannes
Date: Mon May 24 15:31:54 2010
New Revision: 104548

URL: http://llvm.org/viewvc/llvm-project?rev=104548&view=rev
Log:
--- Merging r104547 into '.':
U    gcc/tree.c


Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/tree.c

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/tree.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/tree.c?rev=104548&r1=104547&r2=104548&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/tree.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/tree.c Mon May 24 15:31:54 2010
@@ -3347,8 +3347,10 @@
      entry cache can reduce the number of allocations by more
      than half.  */
   if (last_annotated_node
-      /* LLVM LOCAL - Check for NULL file.  */
+      /* LLVM LOCAL begin - Check for NULL file (both places).  */
       && file
+      && last_annotated_node->file
+      /* LLVM LOCAL end - Check for NULL file (both places).  */
       && last_annotated_node->line == line
       && (last_annotated_node->file == file
 	  || !strcmp (last_annotated_node->file, file)))