commit 9714a6e8a2a2c09a1a7954bdd640b5730de411b2
author Nicolas Geoffray <ngeoffray@google.com> Tue Jun 23 12:09:55 2015 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Tue Jun 23 16:28:34 2015 +0100
tree 7a237d5be79bb84ec7503746970ff6ff26864af9
parent d4a02cfc59a449d216faa687cfdaa4252b4a433f

Fix 496 test.

Make sure the class requested by LoadedByMyClassLoader.bar
is not loaded yet ('Main' is already loaded), in order to
do a proper class loader lookup and not use a dex cache
version.

Change-Id: I77215ae489e6d2c50b90684951bccd0bbf8c1a53

test/496-checker-inlining-and-class-loader/src/Main.java

diff --git a/test/496-checker-inlining-and-class-loader/src/Main.java b/test/496-checker-inlining-and-class-loader/src/Main.java
index 4f23eec..39c031a 100644
--- a/test/496-checker-inlining-and-class-loader/src/Main.java
+++ b/test/496-checker-inlining-and-class-loader/src/Main.java
@@ -82,7 +82,7 @@
   /// CHECK-START: void LoadedByMyClassLoader.bar() inliner (after)
   /// CHECK:      LoadClass
   /// CHECK-NEXT: ClinitCheck
-                /* We inlined Main.$inline$bar */
+                /* We inlined FirstSeenByMyClassLoader.$inline$bar */
   /// CHECK-NEXT: LoadClass
   /// CHECK-NEXT: ClinitCheck
   /// CHECK-NEXT: StaticFieldGet
@@ -91,7 +91,7 @@
   /// CHECK-NEXT: InvokeVirtual
 
   /// CHECK-START: void LoadedByMyClassLoader.bar() register (before)
-                /* Load and initialize Main */
+                /* Load and initialize FirstSeenByMyClassLoader */
   /// CHECK:      LoadClass gen_clinit_check:true
                 /* Load and initialize System */
   /// CHECK-NEXT: LoadClass gen_clinit_check:true
@@ -100,9 +100,9 @@
   /// CHECK-NEXT: NullCheck
   /// CHECK-NEXT: InvokeVirtual
   public static void bar() {
-    Main.$inline$bar();
+    FirstSeenByMyClassLoader.$inline$bar();
     System.out.println("In between the two calls.");
-    Main.$noinline$bar();
+    FirstSeenByMyClassLoader.$noinline$bar();
   }
 }
 
@@ -113,13 +113,4 @@
     Method m = foo.getDeclaredMethod("bar");
     m.invoke(null);
   }
-
-  public static void $inline$bar() {
-  }
-
-  public static void $noinline$bar() {
-    try {
-      System.out.println("In $noinline$bar");
-    } catch (Throwable t) { /* Ignore */ }
-  }
 }