Author: akirtzidis
Date: Mon Apr 22 18:23:42 2013
New Revision: 180070
URL: http://llvm.org/viewvc/llvm-project?rev=180070&view=rev
Log:
When modifying an implicit instantiation with information from an explicit one,
make sure to reset the "right brace" location.
Otherwise the source range of the explicit instantiation may become invalid
(begin location will be after the end location).
rdar://13706991
Modified:
cfe/trunk/lib/Sema/SemaTemplate.cpp
cfe/trunk/test/Index/get-cursor.cpp
Modified: cfe/trunk/lib/Sema/SemaTemplate.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=180070&r1=180069&r2=180070&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplate.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplate.cpp Mon Apr 22 18:23:42 2013
@@ -6460,6 +6460,7 @@ Sema::ActOnExplicitInstantiation(Scope *
// Set source locations for keywords.
Specialization->setExternLoc(ExternLoc);
Specialization->setTemplateKeywordLoc(TemplateLoc);
+ Specialization->setRBraceLoc(SourceLocation());
if (Attr)
ProcessDeclAttributeList(S, Specialization, Attr);
Modified: cfe/trunk/test/Index/get-cursor.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/get-cursor.cpp?rev=180070&r1=180069&r2=180070&view=diff
==============================================================================
--- cfe/trunk/test/Index/get-cursor.cpp (original)
+++ cfe/trunk/test/Index/get-cursor.cpp Mon Apr 22 18:23:42 2013
@@ -55,6 +55,16 @@ struct TS {
template <bool (*tfn)(X*)>
void TS<tfn>::foo() {}
+template <typename T>
+class TC {
+ void init();
+};
+
+template<> void TC<char>::init();
+
+#define EXTERN_TEMPLATE(...) extern template __VA_ARGS__;
+EXTERN_TEMPLATE(class TC<char>)
+
// RUN: c-index-test -cursor-at=%s:6:4 %s | FileCheck
-check-prefix=CHECK-COMPLETION-1 %s
// CHECK-COMPLETION-1: CXXConstructor=X:6:3
// CHECK-COMPLETION-1-NEXT: Completion string: {TypedText X}{LeftParen
(}{Placeholder int}{Comma , }{Placeholder int}{RightParen )}
@@ -115,3 +125,6 @@ void TS<tfn>::foo() {}
// RUN: c-index-test -cursor-at=%s:50:23 -cursor-at=%s:55:23 %s | FileCheck
-check-prefix=CHECK-TEMPLPARAM %s
// CHECK-TEMPLPARAM: 50:23 TypeRef=struct X:3:8 Extent=[50:23 - 50:24]
Spelling=struct X ([50:23 - 50:24])
// CHECK-TEMPLPARAM: 55:23 TypeRef=struct X:3:8 Extent=[55:23 - 55:24]
Spelling=struct X ([55:23 - 55:24])
+
+// RUN: c-index-test -cursor-at=%s:66:23 %s | FileCheck
-check-prefix=CHECK-TEMPLSPEC %s
+// CHECK-TEMPLSPEC: 66:23 ClassDecl=TC:66:23 (Definition) [Specialization of
TC:59:7] Extent=[66:1 - 66:31] Spelling=TC ([66:23 - 66:25])
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
