r218694 - Avoid a crash after loading an #undef'd macro in code completion

[Ben Langmuir]

Author: benlangmuir
Date: Tue Sep 30 15:00:18 2014
New Revision: 218694

URL: http://llvm.org/viewvc/llvm-project?rev=218694&view=rev
Log:
Avoid a crash after loading an #undef'd macro in code completion

In code-completion, don't assume there is a MacroInfo for everything,
since we aren't serializing the def corresponding to a later #undef in
the same module.  Also setup the HadMacro bit correctly for undefs to
avoid an assertion failure.

rdar://18416901

Added:
    cfe/trunk/test/Index/Inputs/module-undef.h
    cfe/trunk/test/Index/complete-module-undef.m
Modified:
    cfe/trunk/lib/Lex/PPMacroExpansion.cpp
    cfe/trunk/lib/Sema/SemaCodeComplete.cpp
    cfe/trunk/test/Index/Inputs/module.map

Modified: cfe/trunk/lib/Lex/PPMacroExpansion.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPMacroExpansion.cpp?rev=218694&r1=218693&r2=218694&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/PPMacroExpansion.cpp (original)
+++ cfe/trunk/lib/Lex/PPMacroExpansion.cpp Tue Sep 30 15:00:18 2014
@@ -49,7 +49,10 @@ void Preprocessor::appendMacroDirective(
   MacroDirective *&StoredMD = Macros[II];
   MD->setPrevious(StoredMD);
   StoredMD = MD;
-  II->setHasMacroDefinition(MD->isDefined());
+  // Setup the identifier as having associated macro history.
+  II->setHasMacroDefinition(true);
+  if (!MD->isDefined())
+    II->setHasMacroDefinition(false);
   bool isImportedMacro = isa<DefMacroDirective>(MD) &&
                          cast<DefMacroDirective>(MD)->isImported();
   if (II->isFromAST() && !isImportedMacro)

Modified: cfe/trunk/lib/Sema/SemaCodeComplete.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaCodeComplete.cpp?rev=218694&r1=218693&r2=218694&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaCodeComplete.cpp (original)
+++ cfe/trunk/lib/Sema/SemaCodeComplete.cpp Tue Sep 30 15:00:18 2014
@@ -2575,11 +2575,12 @@ CodeCompletionResult::CreateCodeCompleti
     const MacroDirective *MD = PP.getMacroDirectiveHistory(Macro);
     assert(MD && "Not a macro?");
     const MacroInfo *MI = MD->getMacroInfo();
+    assert((!MD->isDefined() || MI) && "missing MacroInfo for define");
 
     Result.AddTypedTextChunk(
                             Result.getAllocator().CopyString(Macro->getName()));
 
-    if (!MI->isFunctionLike())
+    if (!MI || !MI->isFunctionLike())
       return Result.TakeString();
     
     // Format a function-like macro with placeholders for the arguments.

Added: cfe/trunk/test/Index/Inputs/module-undef.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/Inputs/module-undef.h?rev=218694&view=auto
==============================================================================
--- cfe/trunk/test/Index/Inputs/module-undef.h (added)
+++ cfe/trunk/test/Index/Inputs/module-undef.h Tue Sep 30 15:00:18 2014
@@ -0,0 +1,2 @@
+#define MY_MACRO 1
+#undef MY_MACRO

Modified: cfe/trunk/test/Index/Inputs/module.map
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/Inputs/module.map?rev=218694&r1=218693&r2=218694&view=diff
==============================================================================
--- cfe/trunk/test/Index/Inputs/module.map (original)
+++ cfe/trunk/test/Index/Inputs/module.map Tue Sep 30 15:00:18 2014
@@ -4,3 +4,5 @@ module ModuleNeedsVFS {
   export *
 }
 framework module * { }
+
+module ModuleUndef { header "module-undef.h" }

Added: cfe/trunk/test/Index/complete-module-undef.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/complete-module-undef.m?rev=218694&view=auto
==============================================================================
--- cfe/trunk/test/Index/complete-module-undef.m (added)
+++ cfe/trunk/test/Index/complete-module-undef.m Tue Sep 30 15:00:18 2014
@@ -0,0 +1,8 @@
+// RUN: rm -rf %t
+// RUN: env CINDEXTEST_COMPLETION_CACHING=1 \
+// RUN:     c-index-test -test-load-source-reparse 2 local %s -fmodules -fmodules-cache-path=%t -I %S/Inputs \
+// RUN:   | FileCheck %s
+
+// rdar://18416901 (used to crash)
+// CHECK: complete-module-undef.m:8:1: ModuleImport=ModuleUndef:8:1 (Definition) Extent=[8:1 - 8:20]
+ at import ModuleUndef;