X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FIntrinsicInst.h;h=4e4d47513dd005046d335d0fa6dd9bbcb24d5a21;hb=1a957d563fe894c797e0eba00bf069fbe7ecba77;hp=da1bc4ddce632fc26921771588b88130b8643d5f;hpb=4556ce5d115f93ad6809d77810b9b770e5f737f2;p=oota-llvm.git

diff --git a/include/llvm/IntrinsicInst.h b/include/llvm/IntrinsicInst.h
index da1bc4ddce6..4e4d47513dd 100644
--- a/include/llvm/IntrinsicInst.h
+++ b/include/llvm/IntrinsicInst.h
@@ -28,6 +28,7 @@
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
 #include "llvm/Intrinsics.h"
+#include "llvm/System/IncludeFile.h"
 
 namespace llvm {
   /// IntrinsicInst - A useful wrapper class for inspecting calls to intrinsic
@@ -96,10 +97,10 @@ namespace llvm {
     }
 
     unsigned getLine() const {
-      return unsigned(cast<ConstantInt>(getOperand(1))->getRawValue());
+      return unsigned(cast<ConstantInt>(getOperand(1))->getZExtValue());
     }
     unsigned getColumn() const {
-      return unsigned(cast<ConstantInt>(getOperand(2))->getRawValue());
+      return unsigned(cast<ConstantInt>(getOperand(2))->getZExtValue());
     }
     
     std::string getFileName() const;
@@ -163,7 +164,7 @@ namespace llvm {
   /// DbgDeclareInst - This represents the llvm.dbg.declare instruction.
   ///
   struct DbgDeclareInst : public DbgInfoIntrinsic {
-    Value *getAllocA() const { return StripCast(getOperand(1)); }
+    Value *getAddress()  const { return getOperand(1); }
     Value *getVariable() const { return StripCast(getOperand(2)); }
 
     // Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -312,6 +313,11 @@ namespace llvm {
       return isa<IntrinsicInst>(V) && classof(cast<IntrinsicInst>(V));
     }
   };
+
 }
 
+// Ensure that the IntrinsicInst.cpp file gets added as a dependency of any 
+// file that includes this header
+FORCE_DEFINING_FILE_TO_BE_LINKED(IntrinsicInst)
+
 #endif