--- a/hotspot/hotspot/test/serviceability/sa/TestPrintMdo.java Thu Feb 16 10:41:19 2017 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) 2017, 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.
- */
-
-import java.util.ArrayList;
-import java.util.Scanner;
-import java.util.List;
-import java.io.File;
-import java.io.IOException;
-import java.util.stream.Collectors;
-import java.io.OutputStream;
-import jdk.test.lib.apps.LingeredApp;
-import jdk.test.lib.JDKToolLauncher;
-import jdk.test.lib.Platform;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.Utils;
-import jdk.test.lib.Asserts;
-
-/*
- * @test
- * @library /test/lib
- * @requires vm.flavor == "server" & !vm.emulatedClient
- * @build jdk.test.lib.apps.*
- * @run main/othervm TestPrintMdo
- */
-
-public class TestPrintMdo {
-
- private static final String PRINTMDO_OUT_FILE = "printmdo_out.txt";
-
- private static void verifyPrintMdoOutput() throws Exception {
-
- Exception unexpected = null;
- File printMdoFile = new File(PRINTMDO_OUT_FILE);
- Asserts.assertTrue(printMdoFile.exists() && printMdoFile.isFile(),
- "File with printmdo output not created: " +
- printMdoFile.getAbsolutePath());
- try {
- Scanner scanner = new Scanner(printMdoFile);
-
- String unexpectedMsg =
- "One or more of 'VirtualCallData', 'CounterData', " +
- "'ReceiverTypeData', 'bci', 'MethodData' " +
- "or 'java/lang/Object' not found";
- boolean knownClassFound = false;
- boolean knownProfileDataTypeFound = false;
- boolean knownTokensFound = false;
-
- while (scanner.hasNextLine()) {
- String line = scanner.nextLine();
- line = line.trim();
- System.out.println(line);
-
- if (line.contains("missing reason for ")) {
- unexpected = new RuntimeException("Unexpected msg: missing reason for ");
- break;
- }
- if (line.contains("VirtualCallData") ||
- line.contains("CounterData") ||
- line.contains("ReceiverTypeData")) {
- knownProfileDataTypeFound = true;
- }
- if (line.contains("bci") ||
- line.contains("MethodData")) {
- knownTokensFound = true;
- }
- if (line.contains("java/lang/Object")) {
- knownClassFound = true;
- }
- }
- if ((knownClassFound == false) ||
- (knownTokensFound == false) ||
- (knownProfileDataTypeFound == false)) {
- unexpected = new RuntimeException(unexpectedMsg);
- }
- if (unexpected != null) {
- throw unexpected;
- }
- } catch (Exception ex) {
- throw new RuntimeException("Test ERROR " + ex, ex);
- } finally {
- printMdoFile.delete();
- }
- }
-
- private static void startClhsdbForPrintMdo(long lingeredAppPid) throws Exception {
-
- Process p;
- JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jhsdb");
- launcher.addToolArg("clhsdb");
- launcher.addToolArg("--pid");
- launcher.addToolArg(Long.toString(lingeredAppPid));
-
- ProcessBuilder pb = new ProcessBuilder();
- pb.command(launcher.getCommand());
- System.out.println(
- pb.command().stream().collect(Collectors.joining(" ")));
-
- try {
- p = pb.start();
- } catch (Exception attachE) {
- throw new Error("Couldn't start jhsdb or attach to LingeredApp : " + attachE);
- }
-
- // Issue the 'printmdo' input at the clhsdb prompt.
- OutputStream input = p.getOutputStream();
- String str = "printmdo -a > " + PRINTMDO_OUT_FILE + "\nquit\n";
- try {
- input.write(str.getBytes());
- input.flush();
- } catch (IOException ioe) {
- throw new Error("Problem issuing the printmdo command: " + str, ioe);
- }
-
- try {
- p.waitFor();
- } catch (InterruptedException ie) {
- throw new Error("Problem awaiting the child process: " + ie, ie);
- }
-
- int exitValue = p.exitValue();
- if (exitValue != 0) {
- String output;
- try {
- output = new OutputAnalyzer(p).getOutput();
- } catch (IOException ioe) {
- throw new Error("Can't get failed clhsdb process output: " + ioe, ioe);
- }
- throw new AssertionError("clhsdb wasn't run successfully: " + output);
- }
- }
-
- public static void main (String... args) throws Exception {
-
- LingeredApp app = null;
-
- if (!Platform.shouldSAAttach()) {
- System.out.println(
- "SA attach not expected to work - test skipped.");
- return;
- }
-
- try {
- List<String> vmArgs = new ArrayList<String>();
- vmArgs.add("-XX:+ProfileInterpreter");
- vmArgs.addAll(Utils.getVmOptions());
-
- app = LingeredApp.startApp(vmArgs);
- System.out.println ("Started LingeredApp with pid " + app.getPid());
- startClhsdbForPrintMdo(app.getPid());
- verifyPrintMdoOutput();
- } finally {
- LingeredApp.stopApp(app);
- }
- }
-}
--- a/hotspot/src/cpu/arm/vm/compiledIC_arm.cpp Thu Feb 16 10:41:19 2017 -0800
+++ b/hotspot/src/cpu/arm/vm/compiledIC_arm.cpp Thu Feb 16 10:46:43 2017 -0800
@@ -85,17 +85,17 @@
}
#undef __
-// size of C2 call stub, compiled java to interpretor
-int CompiledStaticCall::to_interp_stub_size() {
- return 8 * NativeInstruction::instruction_size;
-}
-
// Relocation entries for call stub, compiled java to interpreter.
int CompiledStaticCall::reloc_to_interp_stub() {
return 10; // 4 in emit_to_interp_stub + 1 in Java_Static_Call
}
#endif // COMPILER2 || JVMCI
+// size of C2 call stub, compiled java to interpretor
+int CompiledStaticCall::to_interp_stub_size() {
+ return 8 * NativeInstruction::instruction_size;
+}
+
void CompiledDirectStaticCall::set_to_interpreted(const methodHandle& callee, address entry) {
address stub = find_stub(/*is_aot*/ false);
guarantee(stub != NULL, "stub not found");
@@ -125,6 +125,8 @@
method_holder->set_data((intptr_t)callee());
jump->set_jump_destination(entry);
+ ICache::invalidate_range(stub, to_interp_stub_size());
+
// Update jump to call.
set_destination_mt_safe(stub);
}
--- a/hotspot/test/runtime/Metaspace/DefineClass.java Thu Feb 16 10:41:19 2017 -0800
+++ b/hotspot/test/runtime/Metaspace/DefineClass.java Thu Feb 16 10:46:43 2017 -0800
@@ -24,6 +24,7 @@
/**
* @test
* @bug 8173743
+ * @requires vm.compMode != "Xcomp"
* @summary Failures during class definition can lead to memory leaks in metaspace
* @library /test/lib
* @run main/othervm test.DefineClass defineClass
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/serviceability/sa/TestPrintMdo.java Thu Feb 16 10:46:43 2017 -0800
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+import java.util.ArrayList;
+import java.util.Scanner;
+import java.util.List;
+import java.io.File;
+import java.io.IOException;
+import java.util.stream.Collectors;
+import java.io.OutputStream;
+import jdk.test.lib.apps.LingeredApp;
+import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Utils;
+import jdk.test.lib.Asserts;
+
+/*
+ * @test
+ * @library /test/lib
+ * @requires vm.flavor == "server" & !vm.emulatedClient
+ * @build jdk.test.lib.apps.*
+ * @run main/othervm TestPrintMdo
+ */
+
+public class TestPrintMdo {
+
+ private static final String PRINTMDO_OUT_FILE = "printmdo_out.txt";
+
+ private static void verifyPrintMdoOutput() throws Exception {
+
+ Exception unexpected = null;
+ File printMdoFile = new File(PRINTMDO_OUT_FILE);
+ Asserts.assertTrue(printMdoFile.exists() && printMdoFile.isFile(),
+ "File with printmdo output not created: " +
+ printMdoFile.getAbsolutePath());
+ try {
+ Scanner scanner = new Scanner(printMdoFile);
+
+ String unexpectedMsg =
+ "One or more of 'VirtualCallData', 'CounterData', " +
+ "'ReceiverTypeData', 'bci', 'MethodData' " +
+ "or 'java/lang/Object' not found";
+ boolean knownClassFound = false;
+ boolean knownProfileDataTypeFound = false;
+ boolean knownTokensFound = false;
+
+ while (scanner.hasNextLine()) {
+ String line = scanner.nextLine();
+ line = line.trim();
+ System.out.println(line);
+
+ if (line.contains("missing reason for ")) {
+ unexpected = new RuntimeException("Unexpected msg: missing reason for ");
+ break;
+ }
+ if (line.contains("VirtualCallData") ||
+ line.contains("CounterData") ||
+ line.contains("ReceiverTypeData")) {
+ knownProfileDataTypeFound = true;
+ }
+ if (line.contains("bci") ||
+ line.contains("MethodData")) {
+ knownTokensFound = true;
+ }
+ if (line.contains("java/lang/Object")) {
+ knownClassFound = true;
+ }
+ }
+ if ((knownClassFound == false) ||
+ (knownTokensFound == false) ||
+ (knownProfileDataTypeFound == false)) {
+ unexpected = new RuntimeException(unexpectedMsg);
+ }
+ if (unexpected != null) {
+ throw unexpected;
+ }
+ } catch (Exception ex) {
+ throw new RuntimeException("Test ERROR " + ex, ex);
+ } finally {
+ printMdoFile.delete();
+ }
+ }
+
+ private static void startClhsdbForPrintMdo(long lingeredAppPid) throws Exception {
+
+ Process p;
+ JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jhsdb");
+ launcher.addToolArg("clhsdb");
+ launcher.addToolArg("--pid");
+ launcher.addToolArg(Long.toString(lingeredAppPid));
+
+ ProcessBuilder pb = new ProcessBuilder();
+ pb.command(launcher.getCommand());
+ System.out.println(
+ pb.command().stream().collect(Collectors.joining(" ")));
+
+ try {
+ p = pb.start();
+ } catch (Exception attachE) {
+ throw new Error("Couldn't start jhsdb or attach to LingeredApp : " + attachE);
+ }
+
+ // Issue the 'printmdo' input at the clhsdb prompt.
+ OutputStream input = p.getOutputStream();
+ String str = "printmdo -a > " + PRINTMDO_OUT_FILE + "\nquit\n";
+ try {
+ input.write(str.getBytes());
+ input.flush();
+ } catch (IOException ioe) {
+ throw new Error("Problem issuing the printmdo command: " + str, ioe);
+ }
+
+ try {
+ p.waitFor();
+ } catch (InterruptedException ie) {
+ throw new Error("Problem awaiting the child process: " + ie, ie);
+ }
+
+ int exitValue = p.exitValue();
+ if (exitValue != 0) {
+ String output;
+ try {
+ output = new OutputAnalyzer(p).getOutput();
+ } catch (IOException ioe) {
+ throw new Error("Can't get failed clhsdb process output: " + ioe, ioe);
+ }
+ throw new AssertionError("clhsdb wasn't run successfully: " + output);
+ }
+ }
+
+ public static void main (String... args) throws Exception {
+
+ LingeredApp app = null;
+
+ if (!Platform.shouldSAAttach()) {
+ System.out.println(
+ "SA attach not expected to work - test skipped.");
+ return;
+ }
+
+ try {
+ List<String> vmArgs = new ArrayList<String>();
+ vmArgs.add("-XX:+ProfileInterpreter");
+ vmArgs.addAll(Utils.getVmOptions());
+
+ app = LingeredApp.startApp(vmArgs);
+ System.out.println ("Started LingeredApp with pid " + app.getPid());
+ startClhsdbForPrintMdo(app.getPid());
+ verifyPrintMdoOutput();
+ } finally {
+ LingeredApp.stopApp(app);
+ }
+ }
+}