[llvm-commits] CVS: llvm/lib/Transforms/Utils/CloneFunction.cpp ValueMapper.cpp ValueMapper.h

[Brian Gaeke]

Changes in directory llvm/lib/Transforms/Utils:

CloneFunction.cpp updated: 1.21 -> 1.22
ValueMapper.cpp updated: 1.11 -> 1.12
ValueMapper.h updated: 1.4 -> 1.5

---
Log message:

Move RemapInstruction() to ValueMapper, so that it can be shared with
CloneTrace, and because it is primarily an operation on ValueMaps.  It
is now a global (non-static) function which can be pulled in using
ValueMapper.h.


---
Diffs of the changes:  (+26 -22)

Index: llvm/lib/Transforms/Utils/CloneFunction.cpp
diff -u llvm/lib/Transforms/Utils/CloneFunction.cpp:1.21 llvm/lib/Transforms/Utils/CloneFunction.cpp:1.22
--- llvm/lib/Transforms/Utils/CloneFunction.cpp:1.21	Wed Feb  4 15:44:26 2004
+++ llvm/lib/Transforms/Utils/CloneFunction.cpp	Wed May 19 04:08:11 2004
@@ -20,25 +20,6 @@
 #include "ValueMapper.h"
 using namespace llvm;
 
-// RemapInstruction - Convert the instruction operands from referencing the 
-// current values into those specified by ValueMap.
-//
-static inline void RemapInstruction(Instruction *I, 
-                                    std::map<const Value *, Value*> &ValueMap) {
-  for (unsigned op = 0, E = I->getNumOperands(); op != E; ++op) {
-    const Value *Op = I->getOperand(op);
-    Value *V = MapValue(Op, ValueMap);
-#ifndef NDEBUG
-    if (!V) {
-      std::cerr << "Val = \n" << Op << "Addr = " << (void*)Op;
-      std::cerr << "\nInst = " << I;
-    }
-#endif
-    assert(V && "Referenced value not in value map!");
-    I->setOperand(op, V);
-  }
-}
-
 // CloneBasicBlock - See comments in Cloning.h
 BasicBlock *llvm::CloneBasicBlock(const BasicBlock *BB,
                                   std::map<const Value*, Value*> &ValueMap,


Index: llvm/lib/Transforms/Utils/ValueMapper.cpp
diff -u llvm/lib/Transforms/Utils/ValueMapper.cpp:1.11 llvm/lib/Transforms/Utils/ValueMapper.cpp:1.12
--- llvm/lib/Transforms/Utils/ValueMapper.cpp:1.11	Sat Feb 14 23:55:13 2004
+++ llvm/lib/Transforms/Utils/ValueMapper.cpp	Wed May 19 04:08:12 2004
@@ -99,3 +99,22 @@
   assert(0 && "Unknown value type: why didn't it get resolved?!");
   return 0;
 }
+
+/// RemapInstruction - Convert the instruction operands from referencing the
+/// current values into those specified by ValueMap.
+///
+void llvm::RemapInstruction(Instruction *I,
+                            std::map<const Value *, Value*> &ValueMap) {
+  for (unsigned op = 0, E = I->getNumOperands(); op != E; ++op) {
+    const Value *Op = I->getOperand(op);
+    Value *V = MapValue(Op, ValueMap);
+#ifndef NDEBUG
+    if (!V) {
+      std::cerr << "Val = \n" << Op << "Addr = " << (void*)Op;
+      std::cerr << "\nInst = " << I;
+    }
+#endif
+    assert(V && "Referenced value not in value map!");
+    I->setOperand(op, V);
+  }
+}


Index: llvm/lib/Transforms/Utils/ValueMapper.h
diff -u llvm/lib/Transforms/Utils/ValueMapper.h:1.4 llvm/lib/Transforms/Utils/ValueMapper.h:1.5
--- llvm/lib/Transforms/Utils/ValueMapper.h:1.4	Fri Jan  9 00:12:26 2004
+++ llvm/lib/Transforms/Utils/ValueMapper.h	Wed May 19 04:08:12 2004
@@ -12,14 +12,18 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LIB_TRANSFORMS_UTILS_VALUE_MAPPER_H
-#define LIB_TRANSFORMS_UTILS_VALUE_MAPPER_H
+#ifndef VALUEMAPPER_H
+#define VALUEMAPPER_H
 
 #include <map>
 
 namespace llvm {
   class Value;
-  Value *MapValue(const Value *V, std::map<const Value*, Value*> &VM);
+  class Instruction;
+  typedef std::map<const Value *, Value *> ValueMapTy;
+
+  Value *MapValue(const Value *V, ValueMapTy &VM);
+  void RemapInstruction(Instruction *I, ValueMapTy &VM);
 } // End llvm namespace
 
 #endif