--- /dev/null 2018-03-08 17:24:19.000000000 -0800 +++ new/test/hotspot/jtreg/compiler/aot/fingerprint/SuperChanged.java 2018-03-08 17:24:19.000000000 -0800 @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @summary AOT methods should be swept if a super class has changed. + * @library /test/lib / + * @modules java.base/jdk.internal.misc + * java.management + * @requires vm.aot + * @build compiler.aot.fingerprint.SuperChanged + * compiler.aot.AotCompiler + * + * @run main + * compiler.aot.fingerprint.SuperChanged WRITE-UNMODIFIED-CLASS + * @run driver compiler.aot.AotCompiler -libname libSuperChanged.so + * -class compiler.aot.fingerprint.Foo + * + * @run main + * compiler.aot.fingerprint.SuperChanged TEST-UNMODIFIED + * @run main/othervm -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSuperChanged.so + * -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace + * compiler.aot.fingerprint.SuperChanged TEST-UNMODIFIED + * + * @run main + * compiler.aot.fingerprint.SuperChanged WRITE-MODIFIED-CLASS + * @run main + * compiler.aot.fingerprint.SuperChanged TEST-MODIFIED + * @run main/othervm -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSuperChanged.so + * -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace + * compiler.aot.fingerprint.SuperChanged TEST-MODIFIED + */ + +package compiler.aot.fingerprint; + +import jdk.test.lib.Asserts; +import jdk.test.lib.compiler.InMemoryJavaCompiler; + +import java.io.*; + +class Bar { + volatile int x = 0; + volatile int y = 1; +} + +class Foo extends Bar { + + volatile int z; + int getX() { + for (z = 0; z < 10000; z++) { + if (z % 7 == 1) { + z += 2; + } + } + return x; + } +} + +public class SuperChanged { + public static void main(String args[]) throws Throwable { + Foo f = new Foo(); + System.out.println("f.getX = " + f.getX()); + switch (args[0]) { + case "WRITE-UNMODIFIED-CLASS": + compileClass(false); + break; + case "WRITE-MODIFIED-CLASS": + compileClass(true); + break; + case "TEST-UNMODIFIED": + Asserts.assertTrue(f.getX() == 0, "getX from unmodified Foo class should return 0"); + break; + case "TEST-MODIFIED": + Asserts.assertTrue(f.getX() == 1, "getX from modified Foo class should return 1"); + break; + default: + throw new RuntimeException("unexpected option: " + args[0]); + } + } + + static void compileClass(boolean isModified) throws Throwable { + String class_src_0 = "package compiler.aot.fingerprint; class Bar {volatile int x = 0; volatile int y = 1;}"; + String class_src_1 = "package compiler.aot.fingerprint; class Bar {volatile int y = 0; volatile int x = 1;}"; + String src = (isModified) ? class_src_1 : class_src_0; + + String filename = System.getProperty("test.classes") + "/compiler/aot/fingerprint/Bar.class"; + FileOutputStream fos = new FileOutputStream(filename); + fos.write(InMemoryJavaCompiler.compile("compiler.aot.fingerprint.Bar", src)); + fos.close(); + } +}