diff options
| author | Robert Lytton <robert@xmos.com> | 2014-05-02 09:33:30 +0000 |
|---|---|---|
| committer | Robert Lytton <robert@xmos.com> | 2014-05-02 09:33:30 +0000 |
| commit | b7993571cab59ac03f5f786d778819d0b7a47b6d (patch) | |
| tree | b92bc2577a5c8c752879b8041618f234762e5bb8 /lib/CodeGen/CodeGenModule.cpp | |
| parent | 6f10763ffb8f8b786595a3352722adfb8b5555f9 (diff) | |
| download | clang-b7993571cab59ac03f5f786d778819d0b7a47b6d.tar.gz clang-b7993571cab59ac03f5f786d778819d0b7a47b6d.tar.bz2 clang-b7993571cab59ac03f5f786d778819d0b7a47b6d.tar.xz | |
XCore target: fix bug in dereferencing null pointer.
Also add basic cpp ABI tests where they differ from C ABI output.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@207834 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CodeGenModule.cpp')
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 11f69cc0fc..785c04cb39 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/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; |