From 8d34a182fea1b24f7b8361b55e930cb953cf3fb2 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 16 Sep 2020 09:46:58 +0100 Subject: Change interface conflict stub to take the interface method. To avoid doing dex cache lookup, pass the interface method instead. This costs a few hundred KBs on speed compiled APKs (< 0.5% code size), but improves performance when hitting a conflict (as seen on dogfood data). For nterp, we currently pass the conflict method instead of the interface method. We need to handle default methods before optimizing it. This removes our last use of dex cache in compiled code. A follow-up CL will remove the NeedsDexCacheOfDeclaringClass from HInvokeInterface. Test: test.py Change-Id: I3cdd4543ad7d904b3e81950af46a48a48af6991a --- test/812-recursive-default/src/Main.java | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 test/812-recursive-default/src/Main.java (limited to 'test/812-recursive-default/src/Main.java') diff --git a/test/812-recursive-default/src/Main.java b/test/812-recursive-default/src/Main.java new file mode 100644 index 0000000000..4a6b886c8b --- /dev/null +++ b/test/812-recursive-default/src/Main.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2020 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 Itf { + public default int fib(int a) { + if (a <= 1) return a; + return fib(a - 1) + fib(a - 2); + } +} + +public class Main implements Itf { + + public static void main(String[] args) { + int result = new Main().fib(2); + if (result != 1) { + throw new Error("Expected 1, got " + result); + } + } + + public int fib(int a) { + return Itf.super.fib(a); + } +} -- cgit v1.2.3-59-g8ed1b