From 18ea1c9e9281b5c143b8c376d76c3ff9cae885fb Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Mon, 27 Mar 2017 08:00:18 +0000 Subject: "Revert^6 "CHA for interface method.""" Update test expectations for CHA tests flaking on no-dex2oat. bug:36344221 This reverts commit 27ef25f084017421ca05508208f436b5fc11df73. Change-Id: Ie92adc7a2ec3b3081a1c57d71f8c89247e58cd46 --- .../src-multidex/Base.java | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 test/616-cha-interface-default/src-multidex/Base.java (limited to 'test/616-cha-interface-default/src-multidex/Base.java') diff --git a/test/616-cha-interface-default/src-multidex/Base.java b/test/616-cha-interface-default/src-multidex/Base.java new file mode 100644 index 0000000000..2cbcb500c4 --- /dev/null +++ b/test/616-cha-interface-default/src-multidex/Base.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2017 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. + */ + +interface Base { + default public int foo(int i) { + if (i != 1) { + return -2; + } + return i + 10; + } + + // Test default method that's not inlined. + default public int $noinline$bar() { + System.out.print(""); + System.out.print(""); + System.out.print(""); + System.out.print(""); + System.out.print(""); + System.out.print(""); + System.out.print(""); + System.out.print(""); + return -1; + } + + default void printError(String msg) { + System.out.println(msg); + } +} -- cgit v1.2.3-59-g8ed1b