minor cleanups. Add provisions for a new standard BLOCKINFO_BLOCK

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

diff --git a/include/llvm/IntrinsicInst.h b/include/llvm/IntrinsicInst.h
index fbc3968f26474d430f2957acabdb3e866d574107..4e4d47513dd005046d335d0fa6dd9bbcb24d5a21 100644 (file)
--- a/include/llvm/IntrinsicInst.h
+++ b/include/llvm/IntrinsicInst.h
@@ -28,7 +28,7 @@
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
 #include "llvm/Intrinsics.h"
-#include "llvm/Support/IncludeFile.h"
+#include "llvm/System/IncludeFile.h"
 
 namespace llvm {
   /// IntrinsicInst - A useful wrapper class for inspecting calls to intrinsic
@@ -97,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;
@@ -314,11 +314,10 @@ namespace llvm {
     }
   };
 
-// A hack to ensure that the IntrinsicInst.cpp file gets added as a dependency
-// of any file that 
-extern char LinkIntrinsicInstStub;
-static IncludeFile LinkIntrinsicInst(&LinkIntrinsicInstStub);
-
 }
 
+// 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