Use ASM for invoke-custom tests
Removes the dependency of binary blobs generated by the jack compiler.
Fixes the exception chain raised when a bootstrap method returns null.
Bug: 73807070
Test: art/test/run-test --host 952-invoke-custom
Change-Id: Iac615cdeec342b1b67f50bb1258768e199adff10
diff --git a/test/952-invoke-custom/src/annotations/MethodHandleKind.java b/test/952-invoke-custom/src/annotations/MethodHandleKind.java
new file mode 100644
index 0000000..5847e2f
--- /dev/null
+++ b/test/952-invoke-custom/src/annotations/MethodHandleKind.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package annotations;
+
+/** MethodHandle invocations kinds supported by invokedynamic */
+public enum MethodHandleKind {
+ GET_FIELD,
+ GET_STATIC,
+ PUT_FIELD,
+ PUT_STATIC,
+ INVOKE_VIRTUAL,
+ INVOKE_STATIC,
+ INVOKE_SPECIAL,
+ INVOKE_CONSTRUCTOR,
+ INVOKE_INTERFACE
+}