Respond to Chris' review:

[oota-llvm.git] / lib / VMCore / IntrinsicInst.cpp

diff --git a/lib/VMCore/IntrinsicInst.cpp b/lib/VMCore/IntrinsicInst.cpp
index a85d9a4b223fc65c87997780fe2ad92117544523..cb9252efdf5881bab570f120c1f9573ca849d159 100644 (file)
--- a/lib/VMCore/IntrinsicInst.cpp
+++ b/lib/VMCore/IntrinsicInst.cpp
@@ -2,17 +2,13 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by James M. Laskey and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements methods that make it really easy to deal with intrinsic
-// functions with the isa/dyncast family of functions.  In particular, this
-// allows you to do things like:
-//
-//     if (DbgStopPointInst *SPI = dyn_cast<DbgStopPointInst>(Inst))
-//        ... SPI->getFileName() ... SPI->getDirectory() ...
+// functions.
 //
 // All intrinsic function calls are instances of the call instruction, so these
 // are all subclasses of the CallInst class.  Note that none of these classes
@@ -26,11 +22,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/IntrinsicInst.h"
-
 #include "llvm/Constants.h"
 #include "llvm/GlobalVariable.h"
-#include "llvm/CodeGen/MachineDebugInfo.h"
-
+#include "llvm/Analysis/ValueTracking.h"
+#include "llvm/CodeGen/MachineModuleInfo.h"
 using namespace llvm;
 
 //===----------------------------------------------------------------------===//
@@ -39,7 +34,7 @@ using namespace llvm;
 
 static Value *CastOperand(Value *C) {
   if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C))
-    if (CE->getOpcode() == Instruction::Cast)
+    if (CE->isCast())
       return CE->getOperand(0);
   return NULL;
 }
@@ -56,25 +51,13 @@ Value *DbgInfoIntrinsic::StripCast(Value *C) {
 }
 
 //===----------------------------------------------------------------------===//
-/// DbgStopPointInst - This represents the llvm.dbg.stoppoint instruction.
+/// DbgValueInst - This represents the llvm.dbg.value instruction.
 ///
 
-std::string DbgStopPointInst::getFileName() const {
-  // Once the operand indices are verified, update this assert
-  assert(LLVMDebugVersion == (5 << 16) && "Verify operand indices");
-  GlobalVariable *GV = cast<GlobalVariable>(getContext());
-  ConstantStruct *CS = cast<ConstantStruct>(GV->getInitializer());
-  return CS->getOperand(3)->getStringValue();
+const Value *DbgValueInst::getValue() const {
+  return cast<MDNode>(getOperand(1))->getOperand(0);
 }
 
-std::string DbgStopPointInst::getDirectory() const {
-  // Once the operand indices are verified, update this assert
-  assert(LLVMDebugVersion == (5 << 16) && "Verify operand indices");
-  GlobalVariable *GV = cast<GlobalVariable>(getContext());
-  ConstantStruct *CS = cast<ConstantStruct>(GV->getInitializer());
-  return CS->getOperand(4)->getStringValue();
+Value *DbgValueInst::getValue() {
+  return cast<MDNode>(getOperand(1))->getOperand(0);
 }
-
-//===----------------------------------------------------------------------===//
-/// Ensure that users of IntrinsicInst.h will link with this module.
-DEFINING_FILE_FOR(IntrinsicInst)