make shared variables volatile in loom test

dotty-cps-async · Mar 30, 2024 · 17b4c8d · 17b4c8d
1 parent ec99345
commit 17b4c8d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/compiler-plugin/src/main/scala/cps/plugin/PhaseSelectAndGenerateShiftedMethods.scala b/compiler-plugin/src/main/scala/cps/plugin/PhaseSelectAndGenerateShiftedMethods.scala
@@ -99,8 +99,7 @@ class PhaseSelectAndGenerateShiftedMethods(selectedNodes: SelectedNodes) extends
   }
 
   // generate shifted version for hight-order functions annotated by makeCPS
-  override def transformTemplate(tree: tpd.Template)(using Context): tpd.Tree = {
-    println(s"transformTemplate: ${tree.symbol}")
+  override def transformTemplate(tree: tpd.Template)(using Context): tpd.Tree = { 
     val makeCpsAnnot = Symbols.requiredClass("cps.plugin.annotation.makeCPS")
     val shiftedMethods = tree.body.filter(_.symbol.annotations.exists(_.symbol == makeCpsAnnot))
       .flatMap { m =>

diff --git a/compiler-plugin/testdata/set18loom/m3/TestPME.scala b/compiler-plugin/testdata/set18loom/m3/TestPME.scala
@@ -134,12 +134,14 @@ object PoorManEffect {
             case Success(t) => cf.complete(t)
             case Failure(e) => cf.completeExceptionally(e)
         case None =>
+            throw new IllegalArgumentException(s"invalid submitId=${id}")
     }
 
 
     def process(): Unit = {
-      var blocked: Boolean = false
-      var finished: Boolean = false
+      //println(s"starting process thread ${Thread.currentThread().getId()}")
+      @volatile var blocked: Boolean = false
+      @volatile var finished: Boolean = false
       processEntryCounter.incrementAndGet()
       BlockContext.withBlockContext(
         new BlockContext {
@@ -168,9 +170,7 @@ object PoorManEffect {
         while (!finished && !blocked) {
           while(runQueue.isEmpty && !blocked && nThunksInProcess.get() > 0) {
             submitWaiter.synchronized {
-              if (runQueue.isEmpty && !blocked && nThunksInProcess.get() > 0) {
                 submitWaiter.wait()
-              }
             }
           }
           while (!runQueue.isEmpty && !blocked) {
@@ -207,6 +207,7 @@ object PoorManEffect {
           }
         }
         processEntryCounter.decrementAndGet()
+        //println(s"exiting process thread ${Thread.currentThread().getId()} blocked=${blocked}")
       }
 
     }