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
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28501 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Bytecode/Reader/Reader.cpp b/lib/Bytecode/Reader/Reader.cpp
index 36b2ecb..d441e75 100644
--- a/lib/Bytecode/Reader/Reader.cpp
+++ b/lib/Bytecode/Reader/Reader.cpp
@@ -830,7 +830,15 @@
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 @@
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!");
diff --git a/lib/Bytecode/Writer/Writer.cpp b/lib/Bytecode/Writer/Writer.cpp
index 4ec6b2a..83e8a57 100644
--- a/lib/Bytecode/Writer/Writer.cpp
+++ b/lib/Bytecode/Writer/Writer.cpp
@@ -527,7 +527,8 @@
// 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 @@
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());
+ }
}