diff options
| author | Andy McFadden <fadden@android.com> | 2011-02-18 13:47:56 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-18 13:47:56 -0800 |
| commit | 7d8d16741981d4752a8bbcff2a18a584a7f5aad1 (patch) | |
| tree | 3a378637c5a2e6bff83f824a3324b1e3ffd2847b /vm/compiler | |
| parent | 7354efd1154c453fe9ab31cf0cff9e5aa17a4d44 (diff) | |
| parent | 6af2ddd107842c3737c04c37343cac9be17f4209 (diff) | |
| download | android_dalvik-7d8d16741981d4752a8bbcff2a18a584a7f5aad1.tar.gz android_dalvik-7d8d16741981d4752a8bbcff2a18a584a7f5aad1.tar.bz2 android_dalvik-7d8d16741981d4752a8bbcff2a18a584a7f5aad1.zip | |
Merge "Defer marking of objects as finalizable" into dalvik-dev
Diffstat (limited to 'vm/compiler')
| -rw-r--r-- | vm/compiler/codegen/arm/CodegenDriver.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c index ade419772..2ed17d629 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.c +++ b/vm/compiler/codegen/arm/CodegenDriver.c @@ -3271,10 +3271,8 @@ static bool handleFmt35c_3rc_5rc(CompilationUnit *cUnit, MIR *mir, genTrap(cUnit, mir->offset, pcrLabel); break; } - /* NOP */ case OP_INVOKE_OBJECT_INIT: { - if (gDvmJit.methodTraceSupport) - genInterpSingleStep(cUnit, mir); + genInterpSingleStep(cUnit, mir); break; } case OP_FILLED_NEW_ARRAY: |