changeset 53285:4740bbb9604c fibers

merge
author rpressler
date Thu, 10 Jan 2019 14:26:09 +0000
parents afc0109176f8 70c7313e066e
children ff3e6cba7854
files
diffstat 4 files changed, 10 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/code/nmethod.cpp	Thu Jan 10 14:01:14 2019 +0000
+++ b/src/hotspot/share/code/nmethod.cpp	Thu Jan 10 14:26:09 2019 +0000
@@ -1635,10 +1635,6 @@
   assert(!is_zombie() && !is_unloaded(),
          "should not call follow on zombie or unloaded nmethod");
 
-  if (is_on_continuation_stack() > 0) {
-    return;
-  }
-
   if (is_unloading()) {
     make_unloaded();
   } else {
--- a/src/hotspot/share/gc/shared/gcBehaviours.cpp	Thu Jan 10 14:01:14 2019 +0000
+++ b/src/hotspot/share/gc/shared/gcBehaviours.cpp	Thu Jan 10 14:26:09 2019 +0000
@@ -63,6 +63,10 @@
 
 bool ClosureIsUnloadingBehaviour::is_unloading(CompiledMethod* cm) const {
   if (cm->is_nmethod()) {
+    if (cm->as_nmethod()->is_on_continuation_stack() > 0) {
+      return false;
+    }
+
     IsCompiledMethodUnloadingOopClosure cl(_cl);
     static_cast<nmethod*>(cm)->oops_do(&cl);
     return cl.is_unloading();
--- a/test/jdk/java/lang/Continuation/Basic.java	Thu Jan 10 14:01:14 2019 +0000
+++ b/test/jdk/java/lang/Continuation/Basic.java	Thu Jan 10 14:26:09 2019 +0000
@@ -27,15 +27,14 @@
 * @run testng Basic
 * @run testng/othervm -Xint Basic
 * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -Xint -XX:+UseNewCode Basic
+* @run testng/othervm -XX:+UseParallelGC -XX:-TieredCompilation -Xcomp Basic
+* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UseParallelGC -XX:-TieredCompilation -Xcomp -XX:+UseNewCode Basic
+* @run testng/othervm -XX:+UseParallelGC -XX:TieredStopAtLevel=3 -Xcomp Basic
+* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UseParallelGC -XX:TieredStopAtLevel=3 -Xcomp -XX:+UseNewCode Basic
 *
 * @summary Basic tests for java.lang.Continuation
 */
 
-// * @run testng/othervm -XX:+UseParallelGC -XX:-TieredCompilation -Xcomp Basic
-// * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UseParallelGC -XX:-TieredCompilation -Xcomp -XX:+UseNewCode Basic
-// * @run testng/othervm -XX:+UseParallelGC -XX:TieredStopAtLevel=3 -Xcomp Basic
-// * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UseParallelGC -XX:TieredStopAtLevel=3 -Xcomp -XX:+UseNewCode Basic
-
 // * @run testng/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseParallelGC -XX:-TieredCompilation -XX:+UseJVMCICompiler -Xcomp Basic
 // * @run testng/othervm -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+UseParallelGC -XX:-TieredCompilation -XX:+UseJVMCICompiler -Xcomp -XX:+UseNewCode Basic
 
--- a/test/jdk/java/lang/Continuation/Scoped.java	Thu Jan 10 14:01:14 2019 +0000
+++ b/test/jdk/java/lang/Continuation/Scoped.java	Thu Jan 10 14:26:09 2019 +0000
@@ -26,13 +26,12 @@
  * @run testng Scoped
  * @run testng/othervm -Xint Scoped
  * @run testng/othervm -Xint -XX:+UnlockDiagnosticVMOptions -XX:+UseNewCode Scoped
+ * @run testng/othervm -Xcomp Scoped
+ * @run testng/othervm -Xcomp -XX:+UnlockDiagnosticVMOptions -XX:+UseNewCode Scoped
  *  
  * @summary Nested continuations test
  */
 
-// * @run testng/othervm -Xcomp Scoped
-// * @run testng/othervm -Xcomp -XX:+UnlockDiagnosticVMOptions -XX:+UseNewCode Scoped
-
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;