[llvm-commits] [llvm-gcc-4.2] r94695 - in /llvm-gcc-4.2/trunk/gcc: llvm-backend.cpp llvm-linker-hack.cpp

[Dan Gohman]

Author: djg
Date: Wed Jan 27 17:02:44 2010
New Revision: 94695

URL: http://llvm.org/viewvc/llvm-project?rev=94695&view=rev
Log:
Remove ModuleProviders from llvm-gcc, after r94686.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
    llvm-gcc-4.2/trunk/gcc/llvm-linker-hack.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=94695&r1=94694&r2=94695&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Wed Jan 27 17:02:44 2010
@@ -27,7 +27,6 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/LLVMContext.h"
 #include "llvm/Module.h"
-#include "llvm/ModuleProvider.h"
 #include "llvm/PassManager.h"
 #include "llvm/ValueSymbolTable.h"
 #include "llvm/Analysis/LoopPass.h"
@@ -632,7 +631,7 @@
   // Create and set up the per-function pass manager.
   // FIXME: Move the code generator to be function-at-a-time.
   PerFunctionPasses =
-    new FunctionPassManager(new ExistingModuleProvider(TheModule));
+    new FunctionPassManager(TheModule);
   PerFunctionPasses->add(new TargetData(*TheTarget->getTargetData()));
 
   // In -O0 if checking is disabled, we don't even have per-function passes.
@@ -755,7 +754,7 @@
     // this for fast -O0 compiles!
     if (PerModulePasses || 1) {
       FunctionPassManager *PM = CodeGenPasses =
-        new FunctionPassManager(new ExistingModuleProvider(TheModule));
+        new FunctionPassManager(TheModule);
       PM->add(new TargetData(*TheTarget->getTargetData()));
 
       CodeGenOpt::Level OptLevel = CodeGenOpt::Default;

Modified: llvm-gcc-4.2/trunk/gcc/llvm-linker-hack.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-linker-hack.cpp?rev=94695&r1=94694&r2=94695&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-linker-hack.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-linker-hack.cpp Wed Jan 27 17:02:44 2010
@@ -23,7 +23,6 @@
 #include "llvm/LLVMContext.h"
 #include "llvm/Module.h"
 #include "llvm/Type.h"
-#include "llvm/ModuleProvider.h"
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Analysis/DebugInfo.h"
 #include "llvm/Assembly/PrintModulePass.h"
@@ -46,7 +45,6 @@
 /// This function is never dynamically called.
 ///
 void dummy_function() {
-  llvm::ModuleProvider *MP = new llvm::ExistingModuleProvider(0);
   llvm::LLVMContext Ctxt;
   llvm::raw_os_ostream XXStr(*(std::ostream*)0);
   llvm::createVerifierPass();
@@ -96,7 +94,7 @@
   llvm::Type::getInt8Ty(llvm::getGlobalContext());
 
   llvm::PrettyStackTraceProgram::PrettyStackTraceProgram(0, 0);
-  llvm::DIFactory::DIFactory(*MP->getModule());
+  llvm::DIFactory::DIFactory(*static_cast<llvm::Module *>(0));
   std::string Err;
   llvm::TargetRegistry::lookupTarget("", Err);
 }