The guaranteed alignment of ptr+offset is only the minimum of

[oota-llvm.git] / include / llvm / Instructions.h

diff --git a/include/llvm/Instructions.h b/include/llvm/Instructions.h
index 98df15e4e9408e6f8b6cef12d592bb6e5bfd371c..a4fcb820f4354c0c9b1387502c9c0786c55942a3 100644 (file)
--- a/include/llvm/Instructions.h
+++ b/include/llvm/Instructions.h
@@ -256,7 +256,7 @@ public:
   /// setVolatile - Specify whether this is a volatile load or not.
   ///
   void setVolatile(bool V) { 
-    SubclassData = (SubclassData & ~1) | V; 
+    SubclassData = (SubclassData & ~1) | (V ? 1 : 0); 
   }
 
   virtual LoadInst *clone() const;
@@ -324,7 +324,7 @@ public:
   /// setVolatile - Specify whether this is a volatile load or not.
   ///
   void setVolatile(bool V) { 
-    SubclassData = (SubclassData & ~1) | V; 
+    SubclassData = (SubclassData & ~1) | (V ? 1 : 0); 
   }
 
   /// Transparently provide more efficient getOperand methods.
@@ -917,7 +917,7 @@ public:
   /// if it is a direct call.  If it is a call through a function pointer,
   /// return null.
   Function *getCalledFunction() const {
-    return static_cast<Function*>(dyn_cast<Function>(getOperand(0)));
+    return dyn_cast<Function>(getOperand(0));
   }
 
   /// getCalledValue - Get a pointer to the function that is invoked by this