[llvm-commits] [llvm-gcc-4.2] r104547 - /llvm-gcc-4.2/trunk/gcc/tree.c

[Dale Johannesen]

Author: johannes
Date: Mon May 24 15:19:31 2010
New Revision: 104547

URL: http://llvm.org/viewvc/llvm-project?rev=104547&view=rev
Log:
Do not crash in case of null filename.  Looks like
somebody hit this before and fixed half of it....
8020566/8020267


Modified:
    llvm-gcc-4.2/trunk/gcc/tree.c

Modified: llvm-gcc-4.2/trunk/gcc/tree.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree.c?rev=104547&r1=104546&r2=104547&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/tree.c (original)
+++ llvm-gcc-4.2/trunk/gcc/tree.c Mon May 24 15:19:31 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)))