From ec12bbe359799efc32df6bde5e872cb2713c0b19 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 14 Feb 2015 12:18:48 +0000 Subject: Vendor import of clang RELEASE_360/rc3 tag r229040 (effectively, 3.6.0 RC3): https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_360/rc3@229040 --- lib/AST/DeclCXX.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/AST/DeclCXX.cpp') diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp index a6d9d411eef31..9af8c4b242a6a 100644 --- a/lib/AST/DeclCXX.cpp +++ b/lib/AST/DeclCXX.cpp @@ -1693,12 +1693,12 @@ const Type *CXXCtorInitializer::getBaseClass() const { } SourceLocation CXXCtorInitializer::getSourceLocation() const { - if (isAnyMemberInitializer()) - return getMemberLocation(); - if (isInClassMemberInitializer()) return getAnyMember()->getLocation(); + if (isAnyMemberInitializer()) + return getMemberLocation(); + if (TypeSourceInfo *TSInfo = Initializee.get()) return TSInfo->getTypeLoc().getLocalSourceRange().getBegin(); -- cgit v1.2.3