[vmkit-commits] [vmkit] r180497 - Fixing a }

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 12:16:45 2013
New Revision: 180497

URL: http://llvm.org/viewvc/llvm-project?rev=180497&view=rev
Log:
Fixing a }
(cherry picked from commit f2336d6018a205962bd2d70022010e9376250467)

Modified:
    vmkit/trunk/lib/j3/VMCore/JavaClass.cpp
    vmkit/trunk/lib/vmkit/Compiler/JIT.cpp

Modified: vmkit/trunk/lib/j3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaClass.cpp?rev=180497&r1=180496&r2=180497&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaClass.cpp Thu Apr 25 12:16:45 2013
@@ -555,6 +555,7 @@ bool JavaVirtualTable::isSubtypeOf(JavaV
       if (secondaryTypes[i] == otherVT) {
         cache = otherVT;
         return true;
+      }
     }
   }
   return false;

Modified: vmkit/trunk/lib/vmkit/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/Compiler/JIT.cpp?rev=180497&r1=180496&r2=180497&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/vmkit/Compiler/JIT.cpp Thu Apr 25 12:16:45 2013
@@ -133,7 +133,6 @@ void VmkitModule::initialise(int argc, c
   }
   // Disable branch fold for accurate line numbers.
   llvm_argv[arrayIndex++] = "-disable-branch-fold";
-  llvm_argv[arrayIndex++] = "-fast-isel";
   //llvm_argv[arrayIndex++] = "-stats";
   //llvm_argv[arrayIndex++] = "-time-passes";
   //llvm_argv[arrayIndex++] = "-info-output-file";
@@ -162,37 +161,37 @@ static void addPass(FunctionPassManager
 //
 static void AddStandardCompilePasses(FunctionPassManager* PM) { 
    
-  addPass(PM, createCFGSimplificationPass()); // Clean up disgusting code
-  addPass(PM, createPromoteMemoryToRegisterPass());// Kill useless allocas
-
-  addPass(PM, createInstructionCombiningPass()); // Cleanup for scalarrepl.
-  addPass(PM, createScalarReplAggregatesPass()); // Break up aggregate allocas
-  addPass(PM, createInstructionCombiningPass()); // Cleanup for scalarrepl.
-  addPass(PM, createJumpThreadingPass());        // Thread jumps.
-  addPass(PM, createCFGSimplificationPass());    // Merge & remove BBs
-  addPass(PM, createInstructionCombiningPass()); // Combine silly seq's
-
-  addPass(PM, createCFGSimplificationPass());    // Merge & remove BBs
-  addPass(PM, createReassociatePass());          // Reassociate expressions
-  addPass(PM, createLoopRotatePass());           // Rotate loops.
-  addPass(PM, createLICMPass());                 // Hoist loop invariants
-  addPass(PM, createLoopUnswitchPass());         // Unswitch loops.
-  addPass(PM, createInstructionCombiningPass());
-  addPass(PM, createIndVarSimplifyPass());       // Canonicalize indvars
-  addPass(PM, createLoopDeletionPass());         // Delete dead loops
-  addPass(PM, createLoopUnrollPass());           // Unroll small loops*/
-  addPass(PM, createInstructionCombiningPass()); // Clean up after the unroller
-  addPass(PM, createGVNPass());                  // Remove redundancies
-  addPass(PM, createMemCpyOptPass());             // Remove memcpy / form memset
-  addPass(PM, createSCCPPass());                 // Constant prop with SCCP
+//  addPass(PM, createCFGSimplificationPass()); // Clean up disgusting code
+//  addPass(PM, createPromoteMemoryToRegisterPass());// Kill useless allocas
+//
+//  addPass(PM, createInstructionCombiningPass()); // Cleanup for scalarrepl.
+//  addPass(PM, createScalarReplAggregatesPass()); // Break up aggregate allocas
+//  addPass(PM, createInstructionCombiningPass()); // Cleanup for scalarrepl.
+//  addPass(PM, createJumpThreadingPass());        // Thread jumps.
+//  addPass(PM, createCFGSimplificationPass());    // Merge & remove BBs
+//  addPass(PM, createInstructionCombiningPass()); // Combine silly seq's
+//
+//  addPass(PM, createCFGSimplificationPass());    // Merge & remove BBs
+//  addPass(PM, createReassociatePass());          // Reassociate expressions
+//  addPass(PM, createLoopRotatePass());           // Rotate loops.
+//  addPass(PM, createLICMPass());                 // Hoist loop invariants
+//  addPass(PM, createLoopUnswitchPass());         // Unswitch loops.
+//  addPass(PM, createInstructionCombiningPass());
+//  addPass(PM, createIndVarSimplifyPass());       // Canonicalize indvars
+//  addPass(PM, createLoopDeletionPass());         // Delete dead loops
+//  addPass(PM, createLoopUnrollPass());           // Unroll small loops*/
+//  addPass(PM, createInstructionCombiningPass()); // Clean up after the unroller
+//  addPass(PM, createGVNPass());                  // Remove redundancies
+//  addPass(PM, createMemCpyOptPass());             // Remove memcpy / form memset
+//  addPass(PM, createSCCPPass());                 // Constant prop with SCCP
 
   // Run instcombine after redundancy elimination to exploit opportunities
   // opened up by them.
-  addPass(PM, createInstructionCombiningPass());
-  addPass(PM, createJumpThreadingPass());         // Thread jumps
-  addPass(PM, createDeadStoreEliminationPass());  // Delete dead stores
-  addPass(PM, createAggressiveDCEPass());         // Delete dead instructions
-  addPass(PM, createCFGSimplificationPass());     // Merge & remove BBs
+//  addPass(PM, createInstructionCombiningPass());
+//  addPass(PM, createJumpThreadingPass());         // Thread jumps
+//  addPass(PM, createDeadStoreEliminationPass());  // Delete dead stores
+//  addPass(PM, createAggressiveDCEPass());         // Delete dead instructions
+//  addPass(PM, createCFGSimplificationPass());     // Merge & remove BBs
 }
 
 namespace vmkit {