Merge
authorcoleenp
Thu, 04 Aug 2016 19:50:23 +0000
changeset 40343 a3106ccd0c68
parent 40341 73b575b89b42 (diff)
parent 40342 708dedd4f894 (current diff)
child 40345 19fef85b1851
Merge
--- a/hotspot/src/share/vm/classfile/classLoaderData.cpp	Thu Aug 04 10:11:35 2016 -0700
+++ b/hotspot/src/share/vm/classfile/classLoaderData.cpp	Thu Aug 04 19:50:23 2016 +0000
@@ -1173,7 +1173,7 @@
   if (class_loader() == NULL) {
     out->print("NULL class_loader");
   } else {
-    out->print("class loader " INTPTR_FORMAT, p2i(this));
+    out->print("class loader " INTPTR_FORMAT " ", p2i(this));
     class_loader()->print_value_on(out);
   }
 }
--- a/hotspot/test/compiler/codecache/stress/RandomAllocationTest.java	Thu Aug 04 10:11:35 2016 -0700
+++ b/hotspot/test/compiler/codecache/stress/RandomAllocationTest.java	Thu Aug 04 19:50:23 2016 +0000
@@ -24,6 +24,7 @@
 
 /*
  * @test RandomAllocationTest
+ * @key stress
  * @summary stressing code cache by allocating randomly sized "dummy" code blobs
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java	Thu Aug 04 10:11:35 2016 -0700
+++ b/hotspot/test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java	Thu Aug 04 19:50:23 2016 +0000
@@ -24,6 +24,7 @@
 
 /*
  * @test UnexpectedDeoptimizationTest
+ * @key stress
  * @summary stressing code cache by forcing unexpected deoptimizations
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/codegen/aes/TestAESMain.java	Thu Aug 04 10:11:35 2016 -0700
+++ b/hotspot/test/compiler/codegen/aes/TestAESMain.java	Thu Aug 04 19:50:23 2016 +0000
@@ -25,6 +25,7 @@
 /**
  * @test
  * @bug 7184394
+ * @key stress
  * @summary add intrinsics to use AES instructions
  * @library /testlibrary /
  * @modules java.base/jdk.internal.misc
--- a/hotspot/test/gc/g1/ihop/TestIHOPErgo.java	Thu Aug 04 10:11:35 2016 -0700
+++ b/hotspot/test/gc/g1/ihop/TestIHOPErgo.java	Thu Aug 04 19:50:23 2016 +0000
@@ -24,6 +24,7 @@
  /*
  * @test TestIHOPErgo
  * @bug 8148397
+ * @key stress
  * @summary Test checks that behavior of Adaptive and Static IHOP at concurrent cycle initiation
  * @requires vm.gc.G1
  * @requires !vm.flightRecorder