diff options
| author | 2015-06-09 10:37:32 +0100 | |
|---|---|---|
| committer | 2015-06-10 16:13:34 +0100 | |
| commit | 454a481d116ec4e6dc36fab23a073017b1436d7f (patch) | |
| tree | 9c603f9e2015a405ed1932f397df4f42930c23e2 /test/493-checker-inline-invoke-interface/src/Main.java | |
| parent | bebf6bdf833ea9e090171303200bd8adc9321762 (diff) | |
Revert "Revert "Support for inlining virtual and interface calls.""
It now works thanks to:
- https://android-review.googlesource.com/#/c/154016/ where
the invoke type is changed.
- The new FindMethodIndexIn method in this change, that
locates the right method index relative to the caller's
dex file.
This reverts commit 6e4758615308bb525b6350c30468e33a2e1f2274.
Change-Id: Iddba11664a9241e210fec211cd2aed9f4b90d118
Diffstat (limited to 'test/493-checker-inline-invoke-interface/src/Main.java')
| -rw-r--r-- | test/493-checker-inline-invoke-interface/src/Main.java | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/test/493-checker-inline-invoke-interface/src/Main.java b/test/493-checker-inline-invoke-interface/src/Main.java new file mode 100644 index 0000000000..44b727fe55 --- /dev/null +++ b/test/493-checker-inline-invoke-interface/src/Main.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2015 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 void foo(); +} + +class ForceStatic { + static { + System.out.println("Hello from clinit"); + new Exception().printStackTrace(); + } + static int field; +} + +public class Main implements Itf { + public void foo() { + int a = ForceStatic.field; + } + + /// CHECK-START: void Main.main(java.lang.String[]) inliner (before) + /// CHECK: InvokeStaticOrDirect + /// CHECK: InvokeInterface + + /// CHECK-START: void Main.main(java.lang.String[]) inliner (after) + /// CHECK-NOT: Invoke{{.*}} + public static void main(String[] args) { + Itf itf = bar(); + itf.foo(); + } + + public static Itf bar() { + return new Main(); + } +} |