RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-02-04 11:27:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reject uses of unnamed_addr in declarations.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123358 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2011-01-13 01:30:30 +00:00
parent fef9ff4922
commit d72479c2f0
6 changed files with 60 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/AsmParser/LLParser.cpp
View File

@ -694,12 +694,14 @@ bool LLParser::ParseGlobal(const std::string &Name, LocTy NameLoc,
unsigned Visibility) {
unsigned AddrSpace;
bool ThreadLocal, IsConstant, UnnamedAddr;
LocTy UnnamedAddrLoc;
LocTy TyLoc;
PATypeHolder Ty(Type::getVoidTy(Context));
if (ParseOptionalToken(lltok::kw_thread_local, ThreadLocal) ||
ParseOptionalAddrSpace(AddrSpace) ||
ParseOptionalToken(lltok::kw_unnamed_addr, UnnamedAddr) ||
ParseOptionalToken(lltok::kw_unnamed_addr, UnnamedAddr,
&UnnamedAddrLoc) ||
ParseGlobalType(IsConstant) ||
ParseType(Ty, TyLoc))
return true;
@ -714,6 +716,9 @@ bool LLParser::ParseGlobal(const std::string &Name, LocTy NameLoc,
return true;
}
if (!Init && UnnamedAddr)
return Error(UnnamedAddrLoc, "only definitions can have unnamed_addr");
if (Ty->isFunctionTy() || Ty->isLabelTy())
return Error(TyLoc, "invalid type for global variable");
@ -2669,6 +2674,7 @@ bool LLParser::ParseFunctionHeader(Function *&Fn, bool isDefine) {
unsigned Visibility, RetAttrs;
bool UnnamedAddr;
LocTy UnnamedAddrLoc;
CallingConv::ID CC;
PATypeHolder RetType(Type::getVoidTy(Context));
LocTy RetTypeLoc = Lex.getLoc();
@ -2676,10 +2682,14 @@ bool LLParser::ParseFunctionHeader(Function *&Fn, bool isDefine) {
ParseOptionalVisibility(Visibility) ||
ParseOptionalCallingConv(CC) ||
ParseOptionalAttrs(RetAttrs, 1) ||
ParseOptionalToken(lltok::kw_unnamed_addr, UnnamedAddr) ||
ParseOptionalToken(lltok::kw_unnamed_addr, UnnamedAddr,
&UnnamedAddrLoc) ||
ParseType(RetType, RetTypeLoc, true /*void allowed*/))
return true;
if (!isDefine && UnnamedAddr)
return Error(UnnamedAddrLoc, "only definitions can have unnamed_addr");
// Verify that the linkage is ok.
switch ((GlobalValue::LinkageTypes)Linkage) {
case GlobalValue::ExternalLinkage:

4
lib/AsmParser/LLParser.h
View File

@ -162,10 +162,12 @@ namespace llvm {
Lex.Lex();
return true;
}
bool ParseOptionalToken(lltok::Kind T, bool &Present) {
bool ParseOptionalToken(lltok::Kind T, bool &Present, LocTy *Loc = 0) {
if (Lex.getKind() != T) {
Present = false;
} else {
if (Loc)
*Loc = Lex.getLoc();
Lex.Lex();
Present = true;
}

3
lib/VMCore/Verifier.cpp
View File

@ -469,6 +469,8 @@ void Verifier::visitGlobalVariable(GlobalVariable &GV) {
Assert1(GV.hasExternalLinkage() || GV.hasDLLImportLinkage() ||
GV.hasExternalWeakLinkage(),
"invalid linkage type for global declaration", &GV);
Assert1(!GV.hasUnnamedAddr(), "only definitions can have unnamed_addr",
&GV);
}
visitGlobalValue(GV);
@ -725,6 +727,7 @@ void Verifier::visitFunction(Function &F) {
Assert1(F.hasExternalLinkage() || F.hasDLLImportLinkage() ||
F.hasExternalWeakLinkage(),
"invalid linkage type for function declaration", &F);
Assert1(!F.hasUnnamedAddr(), "only definitions can have unnamed_addr", &F);
} else {
// Verify that this function (which has a body) is not named "llvm.*". It
// is not legal to define intrinsics.

8
test/Assembler/declare-unnamed-addr.ll Normal file
View File

@ -0,0 +1,8 @@
; RUN: not llvm-as %s -o /dev/null 2>%t
; RUN: FileCheck -input-file=%t %s
declare unnamed_addr i32 @zed()
// CHECK: error: only definitions can have unnamed_addr
// CHECK: declare unnamed_addr i32 @zed()
// CHECK: ^

8
test/Assembler/external-unnamed-addr.ll Normal file
View File

@ -0,0 +1,8 @@
; RUN: not llvm-as %s -o /dev/null 2>%t
; RUN: FileCheck -input-file=%t %s
@foo = external unnamed_addr global i8*
// CHECK: error: only definitions can have unnamed_addr
// CHECK: @foo = external unnamed_addr global i8*
// CHECK: ^

26
unittests/VMCore/VerifierTest.cpp
View File

@ -61,5 +61,31 @@ TEST(VerifierTest, AliasUnnamedAddr) {
EXPECT_TRUE(StringRef(Error).startswith("Alias cannot have unnamed_addr"));
}
TEST(VerifierTest, ExternalUnnamedAddr) {
LLVMContext &C = getGlobalContext();
Module M("M", C);
const Type *Ty = Type::getInt8Ty(C);
GlobalVariable *GV = new GlobalVariable(M, Ty, true,
GlobalValue::ExternalLinkage,
NULL, "foo");
GV->setUnnamedAddr(true);
std::string Error;
EXPECT_TRUE(verifyModule(M, ReturnStatusAction, &Error));
EXPECT_TRUE(StringRef(Error)
.startswith("only definitions can have unnamed_addr"));
}
TEST(VerifierTest, DeclarationUnnamedAddr) {
LLVMContext &C = getGlobalContext();
Module M("M", C);
FunctionType *FTy = FunctionType::get(Type::getVoidTy(C), /*isVarArg=*/false);
Function *F = Function::Create(FTy, GlobalValue::ExternalLinkage,
"foo", &M);
F->setUnnamedAddr(true);
std::string Error;
EXPECT_TRUE(verifyModule(M, ReturnStatusAction, &Error));
EXPECT_TRUE(StringRef(Error)
.startswith("only definitions can have unnamed_addr"));
}
}
}