Preserve source location in namespaced base ctor initializers

[shahms]

Summary

Resolved a FIXME to preserve source location in qualified base initializers.

This patch preserves location information for constructs such as:

namespace ns1 {
struct Base {};
struct Derived : Base {

Derived() : ns1::Base() {}

};
}

previously, the reference to ns1 would overlap the reference to Base. With
this patch it properly spans only ns1.

[rsmith]

lib/Sema/SemaDeclCXX.cpp

2987

You also need to initialize the TypeLoc for the contained TypeDeclType (TL.getNamedTypeLoc()).

2988

This should be initialized to SourceLocation(), since there is no elaborated type keyword (struct/union/class/enum) in this case.

[shahms]

Thanks for taking a look at this so quickly. I've updated the test to make sure the TypeRef is correct as well, in light of the changes here.

[shahms]

Address comments and add CHECK for TypeRef as well

[rsmith]

LGTM

[rsmith]

Committed as r255420. Thanks for the patch!

lib/Sema/SemaDeclCXX.cpp

if (!TyD) {
           << MemberOrBase << SourceRange(IdLoc,Init->getSourceRange().getEnd());
         return true;
       }
     }
 
     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));
+      }
     }
   }
 
   if (!TInfo)
     TInfo = Context.getTrivialTypeSourceInfo(BaseType, IdLoc);
 
   return BuildBaseInitializer(BaseType, TInfo, Init, ClassDecl, EllipsisLoc);
 }

test/Index/namespaced-base-ctor-init.cpp

+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]