[cfe-commits] r63182 - in /cfe/trunk: Driver/DependencyFile.cpp test/Driver/dependency-gen.c

Chris Lattner sabre at nondot.org
Tue Jan 27 21:42:39 PST 2009


Author: lattner
Date: Tue Jan 27 23:42:38 2009
New Revision: 63182

URL: http://llvm.org/viewvc/llvm-project?rev=63182&view=rev
Log:
fix a crash I introduced, thanks to Ted for the awesome reduced
testcase :)

Added:
    cfe/trunk/test/Driver/dependency-gen.c
Modified:
    cfe/trunk/Driver/DependencyFile.cpp

Modified: cfe/trunk/Driver/DependencyFile.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/DependencyFile.cpp?rev=63182&r1=63181&r2=63182&view=diff

==============================================================================
--- cfe/trunk/Driver/DependencyFile.cpp (original)
+++ cfe/trunk/Driver/DependencyFile.cpp Tue Jan 27 23:42:38 2009
@@ -174,8 +174,11 @@
   // #line markers to affect dependency generation!
   SourceManager &SM = PP->getSourceManager();
   
-  FileID FID = SM.getFileID(SM.getInstantiationLoc(Loc));
-  const char *Filename = SM.getFileEntryForID(FID)->getName();
+  const FileEntry *FE =
+    SM.getFileEntryForID(SM.getFileID(SM.getInstantiationLoc(Loc)));
+  if (FE == 0) return;
+  
+  const char *Filename = FE->getName();
   if (!FileMatchesDepCriteria(Filename, FileType))
     return;
 

Added: cfe/trunk/test/Driver/dependency-gen.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/dependency-gen.c?rev=63182&view=auto

==============================================================================
--- cfe/trunk/test/Driver/dependency-gen.c (added)
+++ cfe/trunk/test/Driver/dependency-gen.c Tue Jan 27 23:42:38 2009
@@ -0,0 +1,5 @@
+
+// rdar://6533411
+// RUN: clang -MD -MF /tmp/null.d -x c /dev/null
+
+





More information about the cfe-commits mailing list