diff options
author | Elliott Hughes <enh@google.com> | 2012-10-09 18:07:14 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2012-10-09 18:07:14 -0700 |
commit | 4b3f78e73109604b817294a9c21bc3653328e3fb (patch) | |
tree | b703f593c53e226ab68daad714ba0cf9e3d0ec1a /vm/compiler/codegen/arm | |
parent | 3726817959d2bd8bea87726338c05464f7f29e3b (diff) | |
download | android_dalvik-4b3f78e73109604b817294a9c21bc3653328e3fb.tar.gz android_dalvik-4b3f78e73109604b817294a9c21bc3653328e3fb.tar.bz2 android_dalvik-4b3f78e73109604b817294a9c21bc3653328e3fb.zip |
Don't disable inlining for ARM.
I think there was confusion here between method inlining and the method
compiler. Just because the latter isn't yet functional doesn't mean we
don't want the former for those targets that support it.
Bug: 7179010
Change-Id: If0de856b93615f01dfc5e8977d5c97f550cec15f
Diffstat (limited to 'vm/compiler/codegen/arm')
-rw-r--r-- | vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp b/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp index 222b88044..84744b5fc 100644 --- a/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp +++ b/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#if 0 + /* * Rebuild the interpreter frame then punt to the interpreter to execute * instruction at specified PC. @@ -445,3 +447,11 @@ void dvmCompilerMethodMIR2LIR(CompilationUnit *cUnit) selfVerificationBranchInsertPass(cUnit); #endif } + +#else + +void dvmCompilerMethodMIR2LIR(CompilationUnit *cUnit) { + // Method-based JIT not supported for ARM. +} + +#endif |