diff options
| author | Andy McFadden <fadden@android.com> | 2010-12-10 15:23:47 -0800 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2010-12-10 15:24:27 -0800 |
| commit | e91b6e1f666cf2d032971b190205d6574e631be9 (patch) | |
| tree | 401ce7592cd58558f63a041a4cd6e83f11455772 /dexopt | |
| parent | 2867f0b3f48d3dcbdba9b4ba7db27f6107313663 (diff) | |
| download | android_dalvik-e91b6e1f666cf2d032971b190205d6574e631be9.tar.gz android_dalvik-e91b6e1f666cf2d032971b190205d6574e631be9.tar.bz2 android_dalvik-e91b6e1f666cf2d032971b190205d6574e631be9.zip | |
Minor tweaks.
Clean up replaceFailingInstruction() a little. In particular, use
the appropriate method for extracting the opcode, and assert that
the instruction we're replacing was marked "can throw" (if it wasn't,
the list of predecessors in the catch handler will be wrong). Also
remove a declaration that became redundant when we started replacing
instructions in place (as opposed to making a copy of the method body).
Strip out a bit of stale #if 0 code.
Change-Id: Iccf80647237672e2da4b1b46ca9627ae3344704d
Diffstat (limited to 'dexopt')
| -rw-r--r-- | dexopt/OptMain.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/dexopt/OptMain.c b/dexopt/OptMain.c index 194a62b57..765fd7f51 100644 --- a/dexopt/OptMain.c +++ b/dexopt/OptMain.c @@ -549,17 +549,6 @@ bail: } #endif - //dvmLinearAllocDump(NULL); - -#if 0 - { - extern int gDvm__totalInstr, gDvm__gcInstr, gDvm__gcData, - gDvm__gcSimpleData; - LOGI("GC DATA: totinst=%d, gcinst=%d, gcdata=%d simpled=%d\n", - gDvm__totalInstr, gDvm__gcInstr, gDvm__gcData, gDvm__gcSimpleData); - } -#endif - free(bootClassPath); LOGV("DexOpt command complete (result=%d)\n", result); return result; |