(With Doug's help) fix a crash in the code completion code that lead to a test failure.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@82558 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/clang.xcodeproj/project.pbxproj b/clang.xcodeproj/project.pbxproj
index a3ab9cc47e470b0eb0a08b5159c81d3d9858c2db..edb09f82b190913bd94272787bc56cc2a566501f 100644 (file)
--- a/clang.xcodeproj/project.pbxproj
+++ b/clang.xcodeproj/project.pbxproj
@@ -32,8 +32,9 @@
                1A376A2D0D4AED9B002A1C52 /* CGExprConstant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A376A2C0D4AED9B002A1C52 /* CGExprConstant.cpp */; };
                1A471AB50F437BC500753CE8 /* CGBlocks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A471AB40F437BC500753CE8 /* CGBlocks.cpp */; };
                1A4C41BF105B4C0B0047B5E7 /* CGCXXClass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A4C41BE105B4C0B0047B5E7 /* CGCXXClass.cpp */; };
-               1A5119C40FBDF71000A1FF22 /* SemaTemplateInstantiateStmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5119C30FBDF71000A1FF22 /* SemaTemplateInstantiateStmt.cpp */; };
                1A5D5E580E5E81010023C059 /* CGCXX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5D5E570E5E81010023C059 /* CGCXX.cpp */; };
+               1A6B6CD410693FC900BB4A8F /* CodeCompleteConsumer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6B6CD110693FC900BB4A8F /* CodeCompleteConsumer.cpp */; };
+               1A6B6CD510693FC900BB4A8F /* SemaCodeComplete.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6B6CD210693FC900BB4A8F /* SemaCodeComplete.cpp */; };
                1A6FE7090FD6F85800E00CA9 /* CGCXXTemp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FE7080FD6F85800E00CA9 /* CGCXXTemp.cpp */; };
                1A701B640F7C8FE400FEC4D1 /* SemaAccess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A701B630F7C8FE400FEC4D1 /* SemaAccess.cpp */; };
                1A7342480C7B57D500122F56 /* CGObjC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7342470C7B57D500122F56 /* CGObjC.cpp */; };
@@ -363,10 +364,12 @@
                1A376A2C0D4AED9B002A1C52 /* CGExprConstant.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CGExprConstant.cpp; path = lib/CodeGen/CGExprConstant.cpp; sourceTree = "<group>"; tabWidth = 2; };
                1A471AB40F437BC500753CE8 /* CGBlocks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CGBlocks.cpp; path = lib/CodeGen/CGBlocks.cpp; sourceTree = "<group>"; tabWidth = 2; };
                1A4C41BE105B4C0B0047B5E7 /* CGCXXClass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CGCXXClass.cpp; path = lib/CodeGen/CGCXXClass.cpp; sourceTree = "<group>"; tabWidth = 2; };
-               1A5119C30FBDF71000A1FF22 /* SemaTemplateInstantiateStmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = SemaTemplateInstantiateStmt.cpp; path = lib/Sema/SemaTemplateInstantiateStmt.cpp; sourceTree = "<group>"; tabWidth = 2; };
                1A5D5E570E5E81010023C059 /* CGCXX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CGCXX.cpp; path = lib/CodeGen/CGCXX.cpp; sourceTree = "<group>"; tabWidth = 2; };
                1A649E1D0F9599D9005B965E /* CGBlocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CGBlocks.h; path = lib/CodeGen/CGBlocks.h; sourceTree = "<group>"; };
                1A649E1E0F9599DA005B965E /* CGCXX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CGCXX.h; path = lib/CodeGen/CGCXX.h; sourceTree = "<group>"; };
+               1A6B6CD110693FC900BB4A8F /* CodeCompleteConsumer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CodeCompleteConsumer.cpp; path = lib/Sema/CodeCompleteConsumer.cpp; sourceTree = "<group>"; tabWidth = 2; };
+               1A6B6CD210693FC900BB4A8F /* SemaCodeComplete.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = SemaCodeComplete.cpp; path = lib/Sema/SemaCodeComplete.cpp; sourceTree = "<group>"; tabWidth = 2; };
+               1A6B6CD310693FC900BB4A8F /* SemaTemplate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = SemaTemplate.h; path = lib/Sema/SemaTemplate.h; sourceTree = "<group>"; tabWidth = 2; };
                1A6FE7080FD6F85800E00CA9 /* CGCXXTemp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CGCXXTemp.cpp; path = lib/CodeGen/CGCXXTemp.cpp; sourceTree = "<group>"; tabWidth = 2; };
                1A7019E90F79BC1100FEC4D1 /* DiagnosticAnalysisKinds.td */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DiagnosticAnalysisKinds.td; sourceTree = "<group>"; };
                1A7019EA0F79BC1100FEC4D1 /* DiagnosticASTKinds.td */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DiagnosticASTKinds.td; sourceTree = "<group>"; };
@@ -1183,6 +1186,7 @@
                        isa = PBXGroup;
                        children = (
                                35585DBD0EAFBC4500D0A97A /* CXXFieldCollector.h */,
+                               1A6B6CD110693FC900BB4A8F /* CodeCompleteConsumer.cpp */,
                                3527124F0DAFE54700C76352 /* IdentifierResolver.h */,
                                352712500DAFE54700C76352 /* IdentifierResolver.cpp */,
                                DECB6D640F9AE26600F5FBC7 /* JumpDiagnostics.cpp */,
@@ -1204,15 +1208,16 @@
                                DE67E70E0C020ECF00F66BC5 /* SemaExprCXX.cpp */,
                                3599299A0DE2425300A8A33E /* SemaInit.cpp */,
                                357EA27C0F2526F300439B60 /* SemaLookup.cpp */,
+                               1A6B6CD210693FC900BB4A8F /* SemaCodeComplete.cpp */,
                                35E194680ECB82FB00F21733 /* SemaCXXCast.cpp */,
                                35585DBE0EAFBC4500D0A97A /* SemaOverload.cpp */,
                                35585DBF0EAFBC4500D0A97A /* SemaOverload.h */,
                                DE67E70C0C020ECA00F66BC5 /* SemaStmt.cpp */,
                                3591853E0EFB1088000039AF /* SemaTemplate.cpp */,
+                               1A6B6CD310693FC900BB4A8F /* SemaTemplate.h */,
                                BDF87CF60FD746F300BBF872 /* SemaTemplateDeduction.cpp */,
                                35544B8B0F5C803200D92AA9 /* SemaTemplateInstantiate.cpp */,
                                1ADF47AE0F782C3200E48A8A /* SemaTemplateInstantiateDecl.cpp */,
-                               1A5119C30FBDF71000A1FF22 /* SemaTemplateInstantiateStmt.cpp */,
                                DE67E70A0C020EC500F66BC5 /* SemaType.cpp */,
                                1AE4EE3B103B89CA00888A23 /* TreeTransform.h */,
                        );
@@ -1841,7 +1846,6 @@
                                DECB77790FA579B000F5FBC7 /* PCHReaderDecl.cpp in Sources */,
                                DECB77F70FA5850200F5FBC7 /* PCHWriterDecl.cpp in Sources */,
                                DECB78170FA5882F00F5FBC7 /* PCHWriterStmt.cpp in Sources */,
-                               1A5119C40FBDF71000A1FF22 /* SemaTemplateInstantiateStmt.cpp in Sources */,
                                1A2A54B50FD1DD1C00F4CE45 /* AnalysisConsumer.cpp in Sources */,
                                1A2A54B60FD1DD1C00F4CE45 /* ASTConsumers.cpp in Sources */,
                                1A2A54B70FD1DD1C00F4CE45 /* Backend.cpp in Sources */,
@@ -1883,6 +1887,8 @@
                                90129121104812F90083456D /* CIndex.cpp in Sources */,
                                90F9EFAA104ABDED00D09A15 /* c-index-test.c in Sources */,
                                1A4C41BF105B4C0B0047B5E7 /* CGCXXClass.cpp in Sources */,
+                               1A6B6CD410693FC900BB4A8F /* CodeCompleteConsumer.cpp in Sources */,
+                               1A6B6CD510693FC900BB4A8F /* SemaCodeComplete.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/lib/Sema/SemaCodeComplete.cpp b/lib/Sema/SemaCodeComplete.cpp
index 757bb62711d4b9812de4b6b5d44cee0a2ea12b9b..cfec7b237497d3eff79935f9a132cc87ff5d4ec0 100644 (file)
--- a/lib/Sema/SemaCodeComplete.cpp
+++ b/lib/Sema/SemaCodeComplete.cpp
@@ -1132,6 +1132,8 @@ void Sema::CodeCompleteCall(Scope *S, ExprTy *FnIn,
   // Add the remaining viable overload candidates as code-completion reslults.  
   typedef CodeCompleteConsumer::Result Result;
   ResultBuilder Results(*this);
+  Results.EnterNewScope();
+  
   for (OverloadCandidateSet::iterator Cand = CandidateSet.begin(),
                                    CandEnd = CandidateSet.end();
        Cand != CandEnd; ++Cand) {
@@ -1139,6 +1141,7 @@ void Sema::CodeCompleteCall(Scope *S, ExprTy *FnIn,
       Results.MaybeAddResult(Result(Cand->Function, 0), 0);
   }
   
+  Results.ExitScope();
   HandleCodeCompleteResults(CodeCompleter, Results.data(), Results.size());
 }