diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-12-12 02:17:54 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-12-12 02:17:54 +0000 |
| commit | 97047d8cb6eeb4898a0808da52a401dae8b9767e (patch) | |
| tree | 63dcac740ed968ee8062cc3680e5a6baafc2cb4e | |
| parent | 9497cc2bf8c9664263e62be2510daab3353d61fc (diff) | |
| download | bcm5719-llvm-97047d8cb6eeb4898a0808da52a401dae8b9767e.tar.gz bcm5719-llvm-97047d8cb6eeb4898a0808da52a401dae8b9767e.zip | |
Preserve source location information for qualified names used in a constructor
initializer list to name a base class. Patch by Shahms King!
llvm-svn: 255420
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 9 | ||||
| -rw-r--r-- | clang/test/Index/namespaced-base-ctor-init.cpp | 10 |
2 files changed, 17 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 3054088bd6d..b0b362f4cdb 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/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<ElaboratedTypeLoc>(); + TL.getNamedTypeLoc().castAs<TypeSpecTypeLoc>().setNameLoc(IdLoc); + TL.setElaboratedKeywordLoc(SourceLocation()); + TL.setQualifierLoc(SS.getWithLocInContext(Context)); + } } } diff --git a/clang/test/Index/namespaced-base-ctor-init.cpp b/clang/test/Index/namespaced-base-ctor-init.cpp new file mode 100644 index 00000000000..2d60f7c6530 --- /dev/null +++ b/clang/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] |
