maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix a bug in the bc reader/writer: we were not correctly encoding varargs 

nonccc calls (we were dropping the CC and tail flag).  This broke several
FORTRAN programs.

Testcase here: Regression/Assembler/2006-05-26-VarargsCallEncode.ll

llvm-svn: 28501
This commit is contained in:
Chris Lattner 2006-05-26 18:42:34 +00:00
parent 49e7f56e7f
commit 44a793c3a6
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
llvm/lib/Bytecode/Reader/Reader.cpp
View File

@ -830,7 +830,15 @@ void BytecodeReader::ParseInstruction(std::vector<unsigned> &Oprnds,
if (Opcode == 61 || Opcode == 59)
isTailCall = true;
if (Opcode == 58) {
isTailCall = Oprnds.back() & 1;
CallingConv = Oprnds.back() >> 1;
Oprnds.pop_back();
} else if (Opcode == 59 || Opcode == 60) {
CallingConv = CallingConv::Fast;
}
// Check to make sure we have a pointer to function type
const PointerType *PTy = dyn_cast<PointerType>(F->getType());
if (PTy == 0) error("Call to non function pointer value!");
@ -841,13 +849,6 @@ void BytecodeReader::ParseInstruction(std::vector<unsigned> &Oprnds,
if (!FTy->isVarArg()) {
FunctionType::param_iterator It = FTy->param_begin();
if (Opcode == 58) {
isTailCall = Oprnds.back() & 1;
CallingConv = Oprnds.back() >> 1;
Oprnds.pop_back();
} else if (Opcode == 59 || Opcode == 60)
CallingConv = CallingConv::Fast;
for (unsigned i = 1, e = Oprnds.size(); i != e; ++i) {
if (It == FTy->param_end())
error("Invalid call instruction!");

11
llvm/lib/Bytecode/Writer/Writer.cpp
View File

@ -527,7 +527,8 @@ void BytecodeWriter::outputInstrVarArgsCall(const Instruction *I,
// variable argument.
NumFixedOperands = 3+NumParams;
}
output_vbr(2 * I->getNumOperands()-NumFixedOperands);
output_vbr(2 * I->getNumOperands()-NumFixedOperands +
unsigned(Opcode == 56 || Opcode == 58));
// The type for the function has already been emitted in the type field of the
// instruction. Just emit the slot # now.
@ -548,6 +549,14 @@ void BytecodeWriter::outputInstrVarArgsCall(const Instruction *I,
assert(Slot >= 0 && "No slot number for value!?!?");
output_vbr((unsigned)Slot);
}
// If this is the escape sequence for call, emit the tailcall/cc info.
if (Opcode == 58) {
const CallInst *CI = cast<CallInst>(I);
output_vbr((CI->getCallingConv() << 1) | unsigned(CI->isTailCall()));
} else if (Opcode == 56) { // Invoke escape sequence.
output_vbr(cast<InvokeInst>(I)->getCallingConv());
}
}