diff options
| author | Steve Kondik <shade@chemlab.org> | 2014-05-01 20:00:23 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-05-01 20:13:57 -0700 |
| commit | cd2251b84a8c15d970267b77e8116ee0b26289e0 (patch) | |
| tree | 2a8a4ad5ca0c1d57a2426200d995603dbd53eabf | |
| parent | 169bd57177449ba6f9ee62eb01bf49e99522c221 (diff) | |
| download | android_dalvik-cd2251b84a8c15d970267b77e8116ee0b26289e0.tar.gz android_dalvik-cd2251b84a8c15d970267b77e8116ee0b26289e0.tar.bz2 android_dalvik-cd2251b84a8c15d970267b77e8116ee0b26289e0.zip | |
Revert "dalvik: add placeholder for future changes"
* There are GC issues with this version. Rollback for now.
This reverts commit cdf7a375a8e44fad85e90e7234e561088b20a897.
Change-Id: I983a14a7c39f99427e4a437f1a752fc99db91e28
| -rw-r--r-- | vm/compiler/Frontend.cpp | 8 | ||||
| -rw-r--r-- | vm/compiler/codegen/arm/CodegenDriver.cpp | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/vm/compiler/Frontend.cpp b/vm/compiler/Frontend.cpp index 3cebe8238..65ef1ebd9 100644 --- a/vm/compiler/Frontend.cpp +++ b/vm/compiler/Frontend.cpp @@ -1484,11 +1484,6 @@ static bool exhaustTrace(CompilationUnit *cUnit, BasicBlock *curBlock) return true; } -/* placeholder of future passes */ -__attribute__((weak)) void dvmExtraPass(CompilationUnit *cUnit) -{ -} - /* Compile a loop */ static bool compileLoop(CompilationUnit *cUnit, unsigned int startOffset, JitTraceDescription *desc, int numMaxInsts, @@ -1579,15 +1574,12 @@ static bool compileLoop(CompilationUnit *cUnit, unsigned int startOffset, dvmCompilerLoopOpt(cUnit); - /* * Change the backward branch to the backward chaining cell after dataflow * analsys/optimizations are done. */ dvmCompilerInsertBackwardChaining(cUnit); - dvmExtraPass(cUnit); - #if defined(ARCH_IA32) /* Convert MIR to LIR, etc. */ dvmCompilerMIR2LIR(cUnit, info); diff --git a/vm/compiler/codegen/arm/CodegenDriver.cpp b/vm/compiler/codegen/arm/CodegenDriver.cpp index fde74efbb..93ea6133a 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.cpp +++ b/vm/compiler/codegen/arm/CodegenDriver.cpp @@ -4417,8 +4417,7 @@ void dvmCompilerMIR2LIR(CompilationUnit *cUnit) * Append the label pseudo LIR first. Chaining cells will be handled * separately afterwards. */ - if(bb->blockType != kDalvikByteCode || !bb->hidden) - dvmCompilerAppendLIR(cUnit, (LIR *) &labelList[i]); + dvmCompilerAppendLIR(cUnit, (LIR *) &labelList[i]); } if (bb->blockType == kEntryBlock) { |