[llvm] a7bceb3 - [ORC] Make IRSpeculationLayer::BaseLayer an IRLayer.

[Lang Hames via llvm-commits]

Author: Lang Hames
Date: 2022-04-16T14:10:49-07:00
New Revision: a7bceb3f835cea9dce245adb89a5678536b35bd5

URL: https://github.com/llvm/llvm-project/commit/a7bceb3f835cea9dce245adb89a5678536b35bd5
DIFF: https://github.com/llvm/llvm-project/commit/a7bceb3f835cea9dce245adb89a5678536b35bd5.diff

LOG: [ORC] Make IRSpeculationLayer::BaseLayer an IRLayer.

BaseLayer was originally written as an IRCompileLayer, but there was no need for
this restriction. Using IRLayer gives clients more flexibility in choosing the
underlying layer.

Added: 
    

Modified: 
    llvm/include/llvm/ExecutionEngine/Orc/Speculation.h

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/ExecutionEngine/Orc/Speculation.h b/llvm/include/llvm/ExecutionEngine/Orc/Speculation.h
index a138f60a77564..b0195e43388f5 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/Speculation.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/Speculation.h
@@ -175,9 +175,8 @@ class IRSpeculationLayer : public IRLayer {
   using ResultEval = std::function<IRlikiesStrRef(Function &)>;
   using TargetAndLikelies = DenseMap<SymbolStringPtr, SymbolNameSet>;
 
-  IRSpeculationLayer(ExecutionSession &ES, IRCompileLayer &BaseLayer,
-                     Speculator &Spec, MangleAndInterner &Mangle,
-                     ResultEval Interpreter)
+  IRSpeculationLayer(ExecutionSession &ES, IRLayer &BaseLayer, Speculator &Spec,
+                     MangleAndInterner &Mangle, ResultEval Interpreter)
       : IRLayer(ES, BaseLayer.getManglingOptions()), NextLayer(BaseLayer),
         S(Spec), Mangle(Mangle), QueryAnalysis(Interpreter) {}
 
@@ -198,7 +197,7 @@ class IRSpeculationLayer : public IRLayer {
     return InternedNames;
   }
 
-  IRCompileLayer &NextLayer;
+  IRLayer &NextLayer;
   Speculator &S;
   MangleAndInterner &Mangle;
   ResultEval QueryAnalysis;