From f80d68847dcf2a5923eb1e7acfc50c290fdc8f79 Mon Sep 17 00:00:00 2001 From: Robert Lytton Date: Fri, 2 May 2014 09:33:30 +0000 Subject: XCore target: fix bug in dereferencing null pointer. Also add basic cpp ABI tests where they differ from C ABI output. llvm-svn: 207834 --- clang/lib/CodeGen/CodeGenModule.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'clang/lib/CodeGen/CodeGenModule.cpp') diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 11f69cc0fce..785c04cb390 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -1607,17 +1607,18 @@ CodeGenModule::GetOrCreateLLVMGlobal(StringRef MangledName, if (getCXXABI().isInlineInitializedStaticDataMemberLinkOnce() && isVarDeclInlineInitializedStaticDataMember(D)) EmitGlobalVarDefinition(D); + + // Handle XCore specific ABI requirements. + if (getTarget().getTriple().getArch() == llvm::Triple::xcore && + D->getLanguageLinkage() == CLanguageLinkage && + D->getType().isConstant(Context) && + isExternallyVisible(D->getLinkageAndVisibility().getLinkage())) + GV->setSection(".cp.rodata"); } if (AddrSpace != Ty->getAddressSpace()) return llvm::ConstantExpr::getAddrSpaceCast(GV, Ty); - if (getTarget().getTriple().getArch() == llvm::Triple::xcore && - D->getLanguageLinkage() == CLanguageLinkage && - D->getType().isConstant(Context) && - isExternallyVisible(D->getLinkageAndVisibility().getLinkage())) - GV->setSection(".cp.rodata"); - getTargetCodeGenInfo().emitTargetMD(D, GV, *this); return GV; -- cgit v1.2.3