[PATCH] D20593: ValueMaterializer: fuse materializeDeclFor and materializeInitFor (NFC)

[Mehdi AMINI via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL270759: ValueMaterializer: rename materializeDeclFor() to materialize() (authored by mehdi_amini).

Changed prior to commit:
  http://reviews.llvm.org/D20593?vs=58295&id=58508#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D20593

Files:
  llvm/trunk/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
  llvm/trunk/include/llvm/Transforms/Utils/ValueMapper.h
  llvm/trunk/lib/Linker/IRMover.cpp
  llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp

Index: llvm/trunk/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
===================================================================
--- llvm/trunk/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
+++ llvm/trunk/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
@@ -46,7 +46,7 @@
   class LambdaMaterializer final : public ValueMaterializer {
   public:
     LambdaMaterializer(MaterializerFtor M) : M(std::move(M)) {}
-    Value *materializeDeclFor(Value *V) final { return M(V); }
+    Value *materialize(Value *V) final { return M(V); }
 
   private:
     MaterializerFtor M;
Index: llvm/trunk/include/llvm/Transforms/Utils/ValueMapper.h
===================================================================
--- llvm/trunk/include/llvm/Transforms/Utils/ValueMapper.h
+++ llvm/trunk/include/llvm/Transforms/Utils/ValueMapper.h
@@ -49,7 +49,7 @@
 public:
   /// This method can be implemented to generate a mapped Value on demand. For
   /// example, if linking lazily. Returns null if the value is not materialized.
-  virtual Value *materializeDeclFor(Value *V) = 0;
+  virtual Value *materialize(Value *V) = 0;
 };
 
 /// These are flags that the value mapping APIs allow.
Index: llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp
===================================================================
--- llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp
+++ llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp
@@ -361,9 +361,9 @@
 
   // If we have a materializer and it can materialize a value, use that.
   if (auto *Materializer = getMaterializer()) {
-    if (Value *NewV =
-            Materializer->materializeDeclFor(const_cast<Value *>(V))) {
-      return getVM()[V] = NewV;
+    if (Value *NewV = Materializer->materialize(const_cast<Value *>(V))) {
+      getVM()[V] = NewV;
+      return NewV;
     }
   }
 
Index: llvm/trunk/lib/Linker/IRMover.cpp
===================================================================
--- llvm/trunk/lib/Linker/IRMover.cpp
+++ llvm/trunk/lib/Linker/IRMover.cpp
@@ -349,15 +349,15 @@
 
 public:
   GlobalValueMaterializer(IRLinker &TheIRLinker) : TheIRLinker(TheIRLinker) {}
-  Value *materializeDeclFor(Value *V) override;
+  Value *materialize(Value *V) override;
 };
 
 class LocalValueMaterializer final : public ValueMaterializer {
   IRLinker &TheIRLinker;
 
 public:
   LocalValueMaterializer(IRLinker &TheIRLinker) : TheIRLinker(TheIRLinker) {}
-  Value *materializeDeclFor(Value *V) override;
+  Value *materialize(Value *V) override;
 };
 
 /// Type of the Metadata map in \a ValueToValueMapTy.
@@ -513,11 +513,11 @@
   }
 }
 
-Value *GlobalValueMaterializer::materializeDeclFor(Value *SGV) {
+Value *GlobalValueMaterializer::materialize(Value *SGV) {
   return TheIRLinker.materialize(SGV, false);
 }
 
-Value *LocalValueMaterializer::materializeDeclFor(Value *SGV) {
+Value *LocalValueMaterializer::materialize(Value *SGV) {
   return TheIRLinker.materialize(SGV, true);
 }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D20593.58508.patch
Type: text/x-patch
Size: 2945 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160525/c7453056/attachment.bin>