diff options
-rw-r--r-- | include/llvm/Instructions.h | 2 | ||||
-rw-r--r-- | lib/Bytecode/Writer/Writer.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/llvm/Instructions.h b/include/llvm/Instructions.h index 6964668..264e8b6 100644 --- a/include/llvm/Instructions.h +++ b/include/llvm/Instructions.h @@ -505,7 +505,7 @@ public: bool isTailCall() const { return SubclassData & 1; } void setTailCall(bool isTailCall = true) { - SubclassData = (SubclassData & ~1) | isTailCall; + SubclassData = (SubclassData & ~1) | unsigned(isTailCall); } /// getCallingConv/setCallingConv - Get or set the calling convention of this diff --git a/lib/Bytecode/Writer/Writer.cpp b/lib/Bytecode/Writer/Writer.cpp index 81c86d6..aafc352 100644 --- a/lib/Bytecode/Writer/Writer.cpp +++ b/lib/Bytecode/Writer/Writer.cpp @@ -461,7 +461,7 @@ void BytecodeWriter::outputInstructionFormat0(const Instruction *I, output_vbr(cast<InvokeInst>(I)->getCallingConv()); } else if (Opcode == 58) { // Call escape sequence output_vbr((cast<CallInst>(I)->getCallingConv() << 1) | - cast<CallInst>(I)->isTailCall()); + unsigned(cast<CallInst>(I)->isTailCall())); } } else { int Slot = Table.getSlot(I->getOperand(0)); @@ -731,7 +731,7 @@ void BytecodeWriter::outputInstruction(const Instruction &I) { const CallInst &CI = cast<CallInst>(I); ++NumOperands; if (NumOperands < 3) { - Slots[NumOperands-1] = (CI.getCallingConv() << 1) | CI.isTailCall(); + Slots[NumOperands-1] = (CI.getCallingConv() << 1)|unsigned(CI.isTailCall()); if (Slots[NumOperands-1] > MaxOpSlot) MaxOpSlot = Slots[NumOperands-1]; } |