6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-09 11:25:55 +00:00
Code Issues Projects Releases Wiki Activity

Silence VC++ warnings about unsafe mixing of ints and bools with the | operator.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@21758 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jeff Cohen
2005-05-07 02:44:04 +00:00
parent 7939b78170
commit 39cef60259
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/Instructions.h
View File

@@ -505,7 +505,7 @@ public:
bool isTailCall() const { return SubclassData & 1; } bool isTailCall() const { return SubclassData & 1; }
void setTailCall(bool isTailCall = true) { void setTailCall(bool isTailCall = true) {
SubclassData = (SubclassData & ~1) | isTailCall; SubclassData = (SubclassData & ~1) | unsigned(isTailCall);
} }
/// getCallingConv/setCallingConv - Get or set the calling convention of this /// getCallingConv/setCallingConv - Get or set the calling convention of this

4
lib/Bytecode/Writer/Writer.cpp
View File

@@ -461,7 +461,7 @@ void BytecodeWriter::outputInstructionFormat0(const Instruction *I,
output_vbr(cast<InvokeInst>(I)->getCallingConv()); output_vbr(cast<InvokeInst>(I)->getCallingConv());
} else if (Opcode == 58) { // Call escape sequence } else if (Opcode == 58) { // Call escape sequence
output_vbr((cast<CallInst>(I)->getCallingConv() << 1) | output_vbr((cast<CallInst>(I)->getCallingConv() << 1) |
cast<CallInst>(I)->isTailCall()); unsigned(cast<CallInst>(I)->isTailCall()));
} }
} else { } else {
int Slot = Table.getSlot(I->getOperand(0)); int Slot = Table.getSlot(I->getOperand(0));
@@ -731,7 +731,7 @@ void BytecodeWriter::outputInstruction(const Instruction &I) {
const CallInst &CI = cast<CallInst>(I); const CallInst &CI = cast<CallInst>(I);
++NumOperands; ++NumOperands;
if (NumOperands < 3) { 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) if (Slots[NumOperands-1] > MaxOpSlot)
MaxOpSlot = Slots[NumOperands-1]; MaxOpSlot = Slots[NumOperands-1];
} }