From 9c789541c5a37dc8c5d12d98b8db74def61e26db Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 9 Oct 2012 18:07:14 -0700 Subject: 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. (cherry-pick of 4b3f78e73109604b817294a9c21bc3653328e3fb.) Bug: 7179010 Change-Id: I627badb448a056ed4a1cc1e75a05325ce6112876 --- vm/compiler/codegen/x86/CodegenInterface.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'vm/compiler/codegen/x86/CodegenInterface.cpp') diff --git a/vm/compiler/codegen/x86/CodegenInterface.cpp b/vm/compiler/codegen/x86/CodegenInterface.cpp index aade180e0..c99fadd0a 100644 --- a/vm/compiler/codegen/x86/CodegenInterface.cpp +++ b/vm/compiler/codegen/x86/CodegenInterface.cpp @@ -189,8 +189,7 @@ void dvmJitInstallClassObjectPointers(CompilationUnit *cUnit, char *codeAddress) void dvmCompilerMethodMIR2LIR(CompilationUnit *cUnit) { - ALOGE("Method-based JIT not supported for the x86 target"); - dvmAbort(); + // Method-based JIT not supported for x86. } void dvmJitScanAllClassPointers(void (*callback)(void *)) -- cgit v1.2.3