diff options
| author | Andreas Gampe <agampe@google.com> | 2014-10-31 18:12:30 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-03 10:22:23 -0800 |
| commit | 2b0fa5ba4a8f07ee243452003bf93418d30e9448 (patch) | |
| tree | 3fb41e59c663ad861ea65c6032f875cf4bf406b7 /test/etc | |
| parent | 9a41fb1616df7e966e58cabc2abc1b5d90c9e14f (diff) | |
| download | art-2b0fa5ba4a8f07ee243452003bf93418d30e9448.zip art-2b0fa5ba4a8f07ee243452003bf93418d30e9448.tar.gz art-2b0fa5ba4a8f07ee243452003bf93418d30e9448.tar.bz2 | |
ART: Add miranda checking
Add a test for resolution of miranda methods across dex-files. See
CL 112688 and b/18193682 for the code change.
Fix the test script to support no-verify again.
Weaken the dex cache check to a check whether the found method is a
miranda method. This will penalize miranda methods, as they will
always have to be resolved by name, but does not require the multi-step
load of the method's dex cache.
Bug: 18193682
Change-Id: I1dae2a9ec0985dc8625acd7dd5686a5d3cdc8888
Diffstat (limited to 'test/etc')
| -rwxr-xr-x | test/etc/run-test-jar | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 9ecc885..f1044e8 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -39,6 +39,7 @@ USE_GDB="n" USE_JVM="n" VERIFY="y" ZYGOTE="" +DEX_VERIFY="" while true; do if [ "x$1" = "x--quiet" ]; then @@ -176,7 +177,6 @@ if [ "$ZYGOTE" = "" ]; then fi if [ "$VERIFY" = "y" ]; then - DEX_VERIFY="" JVM_VERIFY_ARG="-Xverify:all" msg "Performing verification" else @@ -234,7 +234,12 @@ fi if [ "$INTERPRETER" = "y" ]; then INT_OPTS="-Xint" - COMPILE_FLAGS="${COMPILE_FLAGS} --compiler-filter=interpret-only" + if [ "$VERIFY" = "y" ] ; then + COMPILE_FLAGS="${COMPILE_FLAGS} --compiler-filter=interpret-only" + else + COMPILE_FLAGS="${COMPILE_FLAGS} --compiler-filter=verify-none" + DEX_VERIFY="${DEX_VERIFY} -Xverify:none" + fi fi JNI_OPTS="-Xjnigreflimit:512 -Xcheck:jni" @@ -279,6 +284,7 @@ fi dalvikvm_cmdline="$INVOKE_WITH $GDB $ANDROID_ROOT/bin/$DALVIKVM \ $GDB_ARGS \ $FLAGS \ + $DEX_VERIFY \ -XXlib:$LIB \ $PATCHOAT \ $DEX2OAT \ |