forked from OSchip/llvm-project
Silence VC++ warnings about unsafe mixing of ints and bools with the | operator.
llvm-svn: 21758
This commit is contained in:
parent
b34b273386
commit
6dc6672840
|
@ -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
|
||||
|
|
|
@ -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];
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue