RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 11:02:59 +02:00
Code Issues Projects Releases Wiki Activity

Revert this. There's no way to verifiy indirect calls, and an optimizer can turn

Browse Source 
indirect call into direct call, thus the verifier would reject something it
previously accepted.

llvm-svn: 72249
This commit is contained in:
Torok Edwin 2009-05-22 07:12:05 +00:00
parent 8c1af7f5be
commit 9b75edbd14
3 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/VMCore/Verifier.cpp
View File

@ -1024,31 +1024,6 @@ void Verifier::VerifyCallSite(CallSite CS) {
"Call parameter type does not match function signature!",
CS.getArgument(i), FTy->getParamType(i), I);
Assert2(CS.getType() == FTy->getReturnType(),
"Call return type does not match function signature!",
CS.getInstruction(), FTy->getReturnType());
// Verify calling convention for direct calls
Value *CalledF = CS.getCalledValue()->stripPointerCasts();
if (Function *F = dyn_cast<Function>(CalledF)) {
unsigned CC1 = CS.getCallingConv();
unsigned CC2 = F->getCallingConv();
if(CC1 != CC2) {
// tolerate some mismatch among C prototype and LLVM-specific calling conv
if (CC2 >= CallingConv::FirstTargetCC ||
CC1 >= CallingConv::FirstTargetCC) {
Instruction *I = CS.getInstruction()->clone();
if (CallInst *CI = dyn_cast<CallInst>(I)) {
CI->setCallingConv(F->getCallingConv());
} else
cast<InvokeInst>(I)->setCallingConv(F->getCallingConv());
Assert2(0,"Calling convention does not match function signature!",
CS.getInstruction(), I);
delete I;
}
}
}
if (CS.getCalledValue()->getNameLen() < 5 ||
strncmp(CS.getCalledValue()->getNameStart(), "llvm.", 5) != 0) {
// Verify that none of the arguments are metadata...

9
test/Assembler/2009-05-22-CC.ll
View File

@ -1,9 +0,0 @@
; RUN: llvm-as < %s
; Verify that calls with correct calling conv are accepted
declare x86_stdcallcc i32 @re_string_construct(i8* inreg %pstr, i8* inreg %str, i32 inreg %len, i8* %trans, i32 %icase, i8* %dfa);
define void @main() {
entry:
%0 = call x86_stdcallcc i32 (...)* bitcast (i32 (i8*, i8*, i32, i8*, i32, i8*)* @re_string_construct to i32 (...)*)(i32 inreg 0, i32 inreg 0, i32 inreg 0, i32 0, i32 0, i8* inttoptr (i32 673194176 to i8*));
ret void
}

11
test/Verifier/2009-05-22-CC.ll
View File

@ -1,11 +0,0 @@
; RUN: not llvm-as < %s |& grep {Calling convention does not match function signature}
; PR 4239
; Verify that the calling convention on the call instruction matches the
; declared calling convention
declare x86_stdcallcc i32 @re_string_construct(i8* inreg %pstr, i8* inreg %str, i32 inreg %len, i8* %trans, i32 %icase, i8* %dfa);
define void @main() {
entry:
%0 = call i32 (...)* bitcast (i32 (i8*, i8*, i32, i8*, i32, i8*)* @re_string_construct to i32 (...)*)(i32 inreg 0, i32 inreg 0, i32 inreg 0, i32 0, i32 0, i8* inttoptr (i32 673194176 to i8*))
ret void
}