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.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@13600 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/Utils/ValueMapper.h b/lib/Transforms/Utils/ValueMapper.h
index 941a8b3..a0ad5c3 100644
--- a/lib/Transforms/Utils/ValueMapper.h
+++ b/lib/Transforms/Utils/ValueMapper.h
@@ -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