From 222a971bb76cba8ae1f9a62981304fa7c4c3969d Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Sat, 12 Dec 2015 02:17:54 +0000 Subject: [PATCH] Preserve source location information for qualified names used in a constructor initializer list to name a base class. Patch by Shahms King! git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@255420 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaDeclCXX.cpp | 9 +++++++-- test/Index/namespaced-base-ctor-init.cpp | 10 ++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 test/Index/namespaced-base-ctor-init.cpp diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 3054088bd6..b0b362f4cd 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -2980,10 +2980,15 @@ Sema::BuildMemInitializer(Decl *ConstructorD, if (BaseType.isNull()) { BaseType = Context.getTypeDeclType(TyD); MarkAnyDeclReferenced(TyD->getLocation(), TyD, /*OdrUse=*/false); - if (SS.isSet()) - // FIXME: preserve source range information + if (SS.isSet()) { BaseType = Context.getElaboratedType(ETK_None, SS.getScopeRep(), BaseType); + TInfo = Context.CreateTypeSourceInfo(BaseType); + ElaboratedTypeLoc TL = TInfo->getTypeLoc().castAs(); + TL.getNamedTypeLoc().castAs().setNameLoc(IdLoc); + TL.setElaboratedKeywordLoc(SourceLocation()); + TL.setQualifierLoc(SS.getWithLocInContext(Context)); + } } } diff --git a/test/Index/namespaced-base-ctor-init.cpp b/test/Index/namespaced-base-ctor-init.cpp new file mode 100644 index 0000000000..2d60f7c653 --- /dev/null +++ b/test/Index/namespaced-base-ctor-init.cpp @@ -0,0 +1,10 @@ +namespace ns1 { +struct Base {}; +struct Derived : Base { + Derived() : ns1::Base() {} +}; +} + +// RUN: c-index-test -test-load-source all %s | FileCheck %s +// CHECK: namespaced-base-ctor-init.cpp:4:15: NamespaceRef=ns1:1:11 Extent=[4:15 - 4:18] +// CHECK: namespaced-base-ctor-init.cpp:4:20: TypeRef=struct ns1::Base:2:8 Extent=[4:20 - 4:24] -- 2.40.0