Move Level1 to its own file.
When we don't have oat files, we use runtime semantics
for checking access. At runtime, we're checking whether
the class loader is the same between two classes. This is
information we don't have when we run dex2oat at install time.
So movining Level1 to a public class fixes the access issue
when running the test with --no-prebuild --no-dex2oat.
Change-Id: Ied1f33a9e651f0045501c939eaf94b7b34ba1e66
diff --git a/test/497-inlining-and-class-loader/expected.txt b/test/497-inlining-and-class-loader/expected.txt
index 18d2f2d..3e1d85e 100644
--- a/test/497-inlining-and-class-loader/expected.txt
+++ b/test/497-inlining-and-class-loader/expected.txt
@@ -1,7 +1,7 @@
java.lang.Exception
- at Main.$noinline$bar(Main.java:139)
- at Level2.$inline$bar(Main.java:88)
- at Level1.$inline$bar(Main.java:82)
- at LoadedByMyClassLoader.bar(Main.java:94)
+ at Main.$noinline$bar(Main.java:127)
+ at Level2.$inline$bar(Level1.java:25)
+ at Level1.$inline$bar(Level1.java:19)
+ at LoadedByMyClassLoader.bar(Main.java:82)
at java.lang.reflect.Method.invoke(Native Method)
- at Main.main(Main.java:113)
+ at Main.main(Main.java:101)
diff --git a/test/497-inlining-and-class-loader/src/Level1.java b/test/497-inlining-and-class-loader/src/Level1.java
new file mode 100644
index 0000000..977af83
--- /dev/null
+++ b/test/497-inlining-and-class-loader/src/Level1.java
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+public class Level1 {
+ public static void $inline$bar() {
+ Level2.$inline$bar();
+ }
+}
+
+class Level2 {
+ public static void $inline$bar() {
+ Main.$noinline$bar();
+ }
+}
diff --git a/test/497-inlining-and-class-loader/src/Main.java b/test/497-inlining-and-class-loader/src/Main.java
index bb8da6d..0f7eb59 100644
--- a/test/497-inlining-and-class-loader/src/Main.java
+++ b/test/497-inlining-and-class-loader/src/Main.java
@@ -77,18 +77,6 @@
}
}
-class Level1 {
- public static void $inline$bar() {
- Level2.$inline$bar();
- }
-}
-
-class Level2 {
- public static void $inline$bar() {
- Main.$noinline$bar();
- }
-}
-
class LoadedByMyClassLoader {
public static void bar() {
Level1.$inline$bar();
