[llvm-branch-commits] [cfe-branch] r347797 - Merging r347261:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Wed Nov 28 11:50:01 2018
New Revision: 347797

URL: http://llvm.org/viewvc/llvm-project?rev=347797&view=rev
Log:
Merging r347261:

------------------------------------------------------------------------
r347261 | vedantk | 2018-11-19 12:10:21 -0800 (Mon, 19 Nov 2018) | 11 lines

[Sema] Fix PR38987: keep end location of a direct initializer list

If PerformConstructorInitialization of a direct initializer list constructor is
called while instantiating a template, it has brace locations in its BraceLoc
arguments but not in the Kind argument.

This reverts the hunk https://reviews.llvm.org/D41921#inline-468844.

Patch by Orivej Desh!

Differential Revision: https://reviews.llvm.org/D53231
------------------------------------------------------------------------

Modified:
    cfe/branches/release_70/lib/Sema/SemaInit.cpp
    cfe/branches/release_70/test/SemaCXX/sourceranges.cpp

Modified: cfe/branches/release_70/lib/Sema/SemaInit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_70/lib/Sema/SemaInit.cpp?rev=347797&r1=347796&r2=347797&view=diff
==============================================================================
--- cfe/branches/release_70/lib/Sema/SemaInit.cpp (original)
+++ cfe/branches/release_70/lib/Sema/SemaInit.cpp Wed Nov 28 11:50:01 2018
@@ -6092,7 +6092,10 @@ PerformConstructorInitialization(Sema &S
     TypeSourceInfo *TSInfo = Entity.getTypeSourceInfo();
     if (!TSInfo)
       TSInfo = S.Context.getTrivialTypeSourceInfo(Entity.getType(), Loc);
-    SourceRange ParenOrBraceRange = Kind.getParenOrBraceRange();
+    SourceRange ParenOrBraceRange =
+        (Kind.getKind() == InitializationKind::IK_DirectList)
+        ? SourceRange(LBraceLoc, RBraceLoc)
+        : Kind.getParenOrBraceRange();
 
     if (auto *Shadow = dyn_cast<ConstructorUsingShadowDecl>(
             Step.Function.FoundDecl.getDecl())) {

Modified: cfe/branches/release_70/test/SemaCXX/sourceranges.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_70/test/SemaCXX/sourceranges.cpp?rev=347797&r1=347796&r2=347797&view=diff
==============================================================================
--- cfe/branches/release_70/test/SemaCXX/sourceranges.cpp (original)
+++ cfe/branches/release_70/test/SemaCXX/sourceranges.cpp Wed Nov 28 11:50:01 2018
@@ -52,6 +52,13 @@ void construct() {
   // CHECK: CXXConstructExpr {{0x[0-9a-fA-F]+}} <col:9, col:13> 'D' 'void (int){{( __attribute__\(\(thiscall\)\))?}}'
 }
 
+namespace PR38987 {
+struct A { A(); };
+template <class T> void f() { T{}; }
+template void f<A>();
+// CHECK: CXXTemporaryObjectExpr {{.*}} <col:31, col:33> 'PR38987::A':'PR38987::A'
+}
+
 void abort() __attribute__((noreturn));
 
 namespace std {