summaryrefslogtreecommitdiff
path: root/test/710-varhandle-creation/src-art/Main.java
diff options
context:
space:
mode:
author Orion Hodson <oth@google.com> 2018-01-31 18:08:28 +0000
committer Orion Hodson <oth@google.com> 2018-02-02 15:39:16 +0000
commitda1cdd0b1f89ef76def1c5fa8d2bea83c1a6cf48 (patch)
tree8d7895389f46403c1a0cc8a5ddf8ff92c4355afb /test/710-varhandle-creation/src-art/Main.java
parent2827ff64c7a385cfb9d6e01e6385708461eb65fc (diff)
ART: Fix call site resolution
Parameter type resolution should use the target method's DEX file. Bug: 70166093 Test: art/test/run-test --host 714 Change-Id: Ic4961a905144ee85b36d02476506c4078c6cdf7a
Diffstat (limited to 'test/710-varhandle-creation/src-art/Main.java')
-rw-r--r--test/710-varhandle-creation/src-art/Main.java24
1 files changed, 10 insertions, 14 deletions
diff --git a/test/710-varhandle-creation/src-art/Main.java b/test/710-varhandle-creation/src-art/Main.java
index a737b5ba9e..246aac6900 100644
--- a/test/710-varhandle-creation/src-art/Main.java
+++ b/test/710-varhandle-creation/src-art/Main.java
@@ -1,21 +1,17 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright (C) 2018 The Android Open Source Project
*
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Google designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Google in the LICENSE file that accompanied this code.
+ * 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
*
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 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.
*/
import java.lang.invoke.MethodHandles;