remove always-null IntrinsicLowering argument.

llvm-svn: 26971

4 files changed, 7 insertions, 14 deletions

diff --git a/llvm/include/llvm/Target/TargetMachineRegistry.h b/llvm/include/llvm/Target/TargetMachineRegistry.h
index 77aecd745ae..f1dcc6a2dbd 100644
--- a/llvm/include/llvm/Target/TargetMachineRegistry.h
+++ b/llvm/include/llvm/Target/TargetMachineRegistry.h
@@ -22,7 +22,6 @@
 namespace llvm {
   class Module;
   class TargetMachine;
-  class IntrinsicLowering;
 
   struct TargetMachineRegistry {
     struct Entry;
@@ -49,8 +48,7 @@ namespace llvm {
     struct Entry {
       const char *Name;
       const char *ShortDesc;
-      TargetMachine *(*CtorFn)(const Module &, IntrinsicLowering*,
-                      const std::string &);
+      TargetMachine *(*CtorFn)(const Module &, const std::string &);
       unsigned (*ModuleMatchQualityFn)(const Module &M);
       unsigned (*JITMatchQualityFn)();
 
@@ -58,8 +56,7 @@ namespace llvm {
 
     protected:
       Entry(const char *N, const char *SD,
-            TargetMachine *(*CF)(const Module &, IntrinsicLowering*,
-                                 const std::string &),
+            TargetMachine *(*CF)(const Module &, const std::string &),
             unsigned (*MMF)(const Module &M), unsigned (*JMF)());
     private:
       const Entry *Next;  // Next entry in the linked list.
@@ -82,9 +79,8 @@ namespace llvm {
                                    &TargetMachineImpl::getJITMatchQuality) {
     }
   private:
-    static TargetMachine *Allocator(const Module &M, IntrinsicLowering *IL,
-                                    const std::string &FS) {
-      return new TargetMachineImpl(M, IL, FS);
+    static TargetMachine *Allocator(const Module &M, const std::string &FS) {
+      return new TargetMachineImpl(M, 0, FS);
     }
   };
 
diff --git a/llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp b/llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp
index 05e86e650ae..ef9c8f549e6 100644
--- a/llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp
+++ b/llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp
@@ -61,7 +61,7 @@ ExecutionEngine *JIT::create(ModuleProvider *MP) {
   }
 
   // Allocate a target...
-  TargetMachine *Target = MArch->CtorFn(*MP->getModule(), 0, FeaturesStr);
+  TargetMachine *Target = MArch->CtorFn(*MP->getModule(), FeaturesStr);
   assert(Target && "Could not allocate target machine!");
 
   // If the target supports JIT code generation, return a new JIT now.
diff --git a/llvm/lib/Target/TargetMachineRegistry.cpp b/llvm/lib/Target/TargetMachineRegistry.cpp
index f5bd035d033..2ab8f5110cb 100644
--- a/llvm/lib/Target/TargetMachineRegistry.cpp
+++ b/llvm/lib/Target/TargetMachineRegistry.cpp
@@ -26,8 +26,7 @@ const TargetMachineRegistry::Entry *TargetMachineRegistry::List = 0;
 static TargetRegistrationListener *Listeners = 0;
 
 TargetMachineRegistry::Entry::Entry(const char *N, const char *SD,
-                       TargetMachine *(*CF)(const Module &, IntrinsicLowering*,
-                                            const std::string &),
+                       TargetMachine *(*CF)(const Module &,const std::string &),
                            unsigned (*MMF)(const Module &M), unsigned (*JMF)())
   : Name(N), ShortDesc(SD), CtorFn(CF), ModuleMatchQualityFn(MMF),
     JITMatchQualityFn(JMF), Next(List) {
diff --git a/llvm/tools/llc/llc.cpp b/llvm/tools/llc/llc.cpp
index 30a4880bb74..357eedd0b68 100644
--- a/llvm/tools/llc/llc.cpp
+++ b/llvm/tools/llc/llc.cpp
@@ -119,8 +119,6 @@ int main(int argc, char **argv) {
     
     // Allocate target machine.  First, check whether the user has
     // explicitly specified an architecture to compile for.
-    TargetMachine* (*TargetMachineAllocator)(const Module&,
-                                             IntrinsicLowering *) = 0;
     if (MArch == 0) {
       std::string Err;
       MArch = TargetMachineRegistry::getClosestStaticTargetForModule(mod, Err);
@@ -142,7 +140,7 @@ int main(int argc, char **argv) {
       FeaturesStr = Features.getString();
     }
 
-    std::auto_ptr<TargetMachine> target(MArch->CtorFn(mod, 0, FeaturesStr));
+    std::auto_ptr<TargetMachine> target(MArch->CtorFn(mod, FeaturesStr));
     assert(target.get() && "Could not allocate target machine!");
     TargetMachine &Target = *target.get();
     const TargetData &TD = Target.getTargetData();