summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Igor Murashkin <iam@google.com> 2017-06-21 14:07:02 -0700
committer Igor Murashkin <iam@google.com> 2017-06-22 12:10:08 -0700
commitc0f2321e3236049e5bc97e026f12809dfc8eb675 (patch)
treecf11e606527383feac8b0a979f84ecfbda1cddf1
parent829da136892dc58c607e7dcfc17bb20b0f0263bd (diff)
test: Fix 956-methodhandle-stackframe for javac/dx
javac apparently doesn't like to use #invoke and #invokeExact through a MethodHandle subclass. This seems allowed by JLS so perhaps it might be a javac bug? Bug: 36902714 Test: art/test/run-test --host --build-with-javac-dx 958-methodhandle-stackframe Change-Id: I6c3559502a6a84b4bc2ad884bbbd9d942c5bca94
-rw-r--r--test/958-methodhandle-stackframe/src-art/Main.java2
-rw-r--r--test/knownfailures.json7
2 files changed, 4 insertions, 5 deletions
diff --git a/test/958-methodhandle-stackframe/src-art/Main.java b/test/958-methodhandle-stackframe/src-art/Main.java
index f739d47d08..bb3ce9a760 100644
--- a/test/958-methodhandle-stackframe/src-art/Main.java
+++ b/test/958-methodhandle-stackframe/src-art/Main.java
@@ -86,7 +86,7 @@ public class Main {
new Class<?>[] { boolean.class, char.class, short.class, int.class, long.class,
float.class, double.class, String.class, Object.class }));
- DelegatingTransformer delegate = new DelegatingTransformer(specialFunctionHandle);
+ MethodHandle delegate = new DelegatingTransformer(specialFunctionHandle);
// Test an exact invoke.
//
diff --git a/test/knownfailures.json b/test/knownfailures.json
index 7a48c664c4..8bdaeaaf5a 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -603,12 +603,11 @@
},
{
"tests": [
- "953-invoke-polymorphic-compiler",
- "958-methodhandle-stackframe"
+ "953-invoke-polymorphic-compiler"
],
- "description": "The tests above fail with --build-with-javac-dx.",
+ "description": "Test throws VerifyError when run with --build-with-javac-dx.",
"env_vars": {"ANDROID_COMPILE_WITH_JACK": "false"},
- "bug": "b/37636792"
+ "bug": "b/62722425"
},
{
"tests": [