[vmkit-commits] [vmkit] r61503 - in /vmkit/trunk/lib/JnJVM/VMCore: JnjvmModuleProvider.cpp LowerConstantCalls.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Dec 30 14:43:57 2008
New Revision: 61503

URL: http://llvm.org/viewvc/llvm-project?rev=61503&view=rev
Log:
Merge LowerForcedCalls with LowerConstantCalls and remove LowerForcedCalls.



Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp
    vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp?rev=61503&r1=61502&r2=61503&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp Tue Dec 30 14:43:57 2008
@@ -167,7 +167,6 @@
 
 namespace jnjvm {
   llvm::FunctionPass* createLowerConstantCallsPass();
-  llvm::FunctionPass* createLowerForcedCallsPass();
 }
 
 JnjvmModuleProvider::JnjvmModuleProvider(JnjvmModule *m) {
@@ -187,7 +186,6 @@
   Function* func = m->JavaObjectAllocateFunction;
   JavaFunctionPasses->add(mvm::createEscapeAnalysisPass(func));
   JavaFunctionPasses->add(createLowerConstantCallsPass());
-  JavaFunctionPasses->add(createLowerForcedCallsPass());
   nbCallbacks = 0;
 }
 

Modified: vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp?rev=61503&r1=61502&r2=61503&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp Tue Dec 30 14:43:57 2008
@@ -449,8 +449,10 @@
             BranchInst::Create(NBB, OKBlock);
             break;
           }
+        } else if (V == module->ForceInitialisationCheckFunction) {
+          Changed = true;
+          CI->eraseFromParent();
         }
-
 #ifdef ISOLATE_SHARING
         else if (V == module->GetCtpClassFunction) {
           Changed = true;
@@ -504,41 +506,5 @@
 FunctionPass* createLowerConstantCallsPass() {
   return new LowerConstantCalls();
 }
-  
-class VISIBILITY_HIDDEN LowerForcedCalls : public FunctionPass {
-  public:
-    static char ID;
-    LowerForcedCalls() : FunctionPass((intptr_t)&ID) { }
-
-    virtual bool runOnFunction(Function &F);
-  private:
-  };
-  char LowerForcedCalls::ID = 0;
-  static RegisterPass<LowerForcedCalls> Y("LowerForcedCalls",
-                                            "Lower Forced calls");
-
-bool LowerForcedCalls::runOnFunction(Function& F) {
-  JnjvmModule* module = (JnjvmModule*)F.getParent();
-  bool Changed = false;
-  for (Function::iterator BI = F.begin(), BE = F.end(); BI != BE; BI++) { 
-    BasicBlock *Cur = BI; 
-    for (BasicBlock::iterator II = Cur->begin(), IE = Cur->end(); II != IE;) {
-      Instruction *I = II;
-      II++;
-      if (CallInst *CI = dyn_cast<CallInst>(I)) {
-        Value* V = CI->getOperand(0);
-        if (V == module->ForceInitialisationCheckFunction) {
-          Changed = true;
-          CI->eraseFromParent();
-        }
-      }
-    }
-  }
-  return Changed;
-}
-
-FunctionPass* createLowerForcedCallsPass() {
-  return new LowerForcedCalls();
-}
 
 }