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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@21758 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Instructions.h b/include/llvm/Instructions.h
index 696466858d19b99d960bf83a0d6c688734aa064b..264e8b64b9245553be38fcbea45d844073eed419 100644 (file)
--- 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 81c86d6ffabcbcb3b8141db226a4c4ad61b81cb5..aafc3529c3bc1efdee3e2321ef487d3e866ae023 100644 (file)
--- 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];
       }