dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Robert Lytton 2014-05-02 09:33:30 +00:00
parent 6f10763ffb
commit b7993571ca
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/CodeGen/CodeGenModule.cpp
View File

@ -1607,17 +1607,18 @@ CodeGenModule::GetOrCreateLLVMGlobal(StringRef MangledName,
if (getCXXABI().isInlineInitializedStaticDataMemberLinkOnce() && if (getCXXABI().isInlineInitializedStaticDataMemberLinkOnce() &&
isVarDeclInlineInitializedStaticDataMember(D)) isVarDeclInlineInitializedStaticDataMember(D))
EmitGlobalVarDefinition(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()) if (AddrSpace != Ty->getAddressSpace())
return llvm::ConstantExpr::getAddrSpaceCast(GV, Ty); 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); getTargetCodeGenInfo().emitTargetMD(D, GV, *this);
return GV; return GV;

27
test/CodeGen/xcore-abi.cpp Normal file
View File

@ -0,0 +1,27 @@
// REQUIRES: xcore-registered-target
// RUN: %clang_cc1 -triple xcore-unknown-unknown -fno-signed-char -fno-common -emit-llvm -o - -x c++ %s | FileCheck %s
// CHECK: target triple = "xcore-unknown-unknown"
// C++ constants are not placed into the ".cp.rodata" section.
// CHECK: @cgx = external constant i32
extern const int cgx;
int fcgx() { return cgx;}
// CHECK: @g1 = global i32 0, align 4
int g1;
// CHECK: @cg1 = constant i32 0, align 4
extern const int cg1 = 0;
// Regression test for a bug in lib/CodeGen/CodeGenModule.cpp which called
// getLanguageLinkage() via a null 'VarDecl*'. This was an XCore specific
// conditional call to GV->setSection(".cp.rodata").
class C {
public:
~C(){};
};
C c;
// CHECK: "no-frame-pointer-elim"="false"
// CHECK-NOT: "no-frame-pointer-elim-non-leaf"