Fixing #7140: Implementing new lazy vals scheme

community-build/src/scala/dotty/communitybuild/projects.scala

@@ -791,14 +791,19 @@ object projects:
     dependencies = () => List(cats, disciplineMunit)
   )
 
-  lazy val http4s = SbtCommunityProject(
-    project = "http4s",
-    sbtTestCommand = "tests/test; server/test; client/test; ember-core/test; ember-server/test; ember-client/test; circe/test",
-    sbtPublishCommand = "publishLocal",
-    scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"),
-    dependencies = () => List(cats, catsEffect3, fs2, disciplineMunit, scalacheckEffect)
+  lazy val specs2 = SbtCommunityProject(
+    project = "specs2",
+    sbtTestCommand = "core/testOnly -- exclude ci",
+    sbtPublishCommand = "core/publishLocal",
+    dependencies = () => List()
   )
 
+  lazy val spire = SbtCommunityProject(
+    project = "spire",
+    sbtTestCommand = "test",
+    sbtPublishCommand = "publishLocal",
+    dependencies = () => List(cats, disciplineMunit)
+  )
 end projects
 
 lazy val forwardCompatMapping = Map[CommunityProject, CommunityProject](

compiler/test-resources/scripting/scriptPath.sc

@@ -16,6 +16,8 @@
       val pathEntries = System.getenv("PATH").split(psep).toList
       System.err.printf("sun.java.command: %s\n", sys.props("sun.java.command"))
       System.err.printf("first 5 PATH entries:\n%s\n",pathEntries.take(5).mkString("\n"))
+      printf("script.path: %s\n",path.norm)
+      assert(path.endsWith("scriptPath.sc"),s"actual path [$path]")
     }
 
   extension(s: String)

compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala

@@ -597,7 +597,7 @@ class TestBCode extends DottyBytecodeTest {
       val clsIn   = dir.lookupName("Test.class", directory = false).input
       val clsNode = loadClassNode(clsIn)
       val method  = getMethod(clsNode, "test")
-      assertEquals(93, instructionsFromMethod(method).size)
+      assertEquals(122, instructionsFromMethod(method).size)
     }
   }
 

library/src/scala/runtime/LazyVals.scala

@@ -1,5 +1,7 @@
 package scala.runtime
 
+import java.lang.reflect.Modifier
+
 /**
  * Helper methods used in thread-safe lazy vals.
  */
@@ -22,6 +24,7 @@ object LazyVals {
     val processors = java.lang.Runtime.getRuntime.nn.availableProcessors()
     8 * processors * processors
   }
+
   private[this] val monitors: Array[Object] =
     Array.tabulate(base)(_ => new Object)
 
@@ -37,6 +40,41 @@ object LazyVals {
 
   /* ------------- Start of public API ------------- */
 
+  /**
+   * Used to indicate the state of a lazy val that is being
+   * evaluated and of which other threads await the result.
+   */
+  final class Waiting:
+    private var done = false
+
+    /**
+     * Wakes up waiting threads. Called on completion of the evaluation
+     * of lazy val's right-hand side.
+     */
+    def release(): Unit = synchronized {
+      done = true
+      notifyAll()
+    }
+
+    /**
+     * Awaits the completion of the evaluation of lazy val's right-hand side.
+     */
+    def awaitRelease(): Unit = synchronized {
+      while !done do wait()
+    }
+
+  /**
+   * Used to indicate the state of a lazy val that is currently being
+   * evaluated with no other thread awaiting its result.
+   */
+  object Evaluating
+
+  /**
+   * Used to indicate the state of a lazy val that has been evaluated to
+   * `null`.
+   */
+  object NULL
+
   final val BITS_PER_LAZY_VAL = 2L
 
   def STATE(cur: Long, ord: Int): Long = {
@@ -54,6 +92,12 @@ object LazyVals {
     unsafe.compareAndSwapLong(t, offset, e, n)
   }
 
+  def objCAS(t: Object, offset: Long, exp: Object, n: Object): Boolean = {
+    if (debug)
+      println(s"objCAS($t, $exp, $n)")
+    unsafe.compareAndSwapObject(t, offset, exp, n)
+  }
+
   def setFlag(t: Object, offset: Long, v: Int, ord: Int): Unit = {
     if (debug)
       println(s"setFlag($t, $offset, $v, $ord)")
@@ -106,12 +150,26 @@ object LazyVals {
     r
   }
 
+  def getStaticOffset(clz: Class[_], name: String): Long = {
+    val r = unsafe.staticFieldOffset(clz.getDeclaredField(name))
+    if (debug)
+      println(s"getStaticOffset($clz, $name) = $r")
+    r
+  }
+
   object Names {
+    final val waiting = "Waiting"
+    final val evaluating = "Evaluating"
+    final val nullValued = "NULL"
+    final val waitingAwaitRelease = "awaitRelease"
+    final val waitingRelease = "release"
     final val state = "STATE"
     final val cas = "CAS"
+    final val objCas = "objCAS"
     final val setFlag = "setFlag"
     final val wait4Notification = "wait4Notification"
     final val get = "get"
     final val getOffset = "getOffset"
+    final val getStaticOffset = "getStaticOffset"
   }
 }

project/MiMaFilters.scala

@@ -12,12 +12,24 @@ object MiMaFilters {
     ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#SymbolMethods.termRef"),
     ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeTreeModule.ref"),
 
-    // Experimental `MainAnnotation` APIs. Can be added in 3.3.0 or later.
-    ProblemFilters.exclude[MissingClassProblem]("scala.annotation.MainAnnotation"),
-    ProblemFilters.exclude[MissingClassProblem]("scala.annotation.MainAnnotation$"),
-    ProblemFilters.exclude[MissingClassProblem]("scala.annotation.MainAnnotation$Command"),
-    ProblemFilters.exclude[MissingClassProblem]("scala.annotation.MainAnnotation$CommandInfo"),
-    ProblemFilters.exclude[MissingClassProblem]("scala.annotation.MainAnnotation$ParameterInfo"),
-    ProblemFilters.exclude[MissingClassProblem]("scala.annotation.MainAnnotation$ParameterAnnotation"),
+    // Private to the compiler - needed for forward binary compatibility
+    ProblemFilters.exclude[MissingClassProblem]("scala.annotation.since"),
+
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.getStaticOffset"),
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.getStaticOffset"),
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.objCAS"),
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.objCAS"),
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.evaluating"),
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.getStaticOffset"),
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.nullValued"),
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.objCas"),
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.waiting"),
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.waitingAwaitRelease"),
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.waitingRelease"),
+    ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$Evaluating$"),
+    ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$NULL$"),
+    ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$Waiting"),
+    ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.LazyVals.Evaluating"),
+    ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.LazyVals.NULL")
   )
 }

tests/init/neg/promotion-loop.check

@@ -1,7 +1,11 @@
 -- Error: tests/init/neg/promotion-loop.scala:16:10 --------------------------------------------------------------------
 16 |  println(b)      // error
    |          ^
+<<<<<<< HEAD
+   |          Cannot prove that the value is fully-initialized. Only initialized values may be used as arguments.
+=======
    |          Cannot prove that the value is fully initialized. Only initialized values may be used as arguments.
+>>>>>>> 91c03b1f7835d574290eba1ecf236e0f59fc2bf0
    |
    |          The unsafe promotion may cause the following problem:
    |          Cannot prove that the value is fully initialized. Only initialized values may be used as arguments.

tests/init/neg/t3273.check

@@ -1,7 +1,7 @@
 -- Error: tests/init/neg/t3273.scala:4:42 ------------------------------------------------------------------------------
 4 |  val num1: LazyList[Int] = 1 #:: num1.map(_ + 1)                        // error
   |                                  ^^^^^^^^^^^^^^^
-  |              Cannot prove that the value is fully initialized. Only initialized values may be used as arguments.
+  |             Cannot prove that the value is fully-initialized. Only initialized values may be used as arguments.
   |
   |              The unsafe promotion may cause the following problem:
   |              Access non-initialized value num1. Calling trace:
@@ -10,7 +10,7 @@
 -- Error: tests/init/neg/t3273.scala:5:61 ------------------------------------------------------------------------------
 5 |  val num2: LazyList[Int] = 1 #:: num2.iterator.map(_ + 1).to(LazyList)  // error
   |                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  |              Cannot prove that the value is fully initialized. Only initialized values may be used as arguments.
+  |             Cannot prove that the value is fully-initialized. Only initialized values may be used as arguments.
   |
   |              The unsafe promotion may cause the following problem:
   |              Access non-initialized value num2. Calling trace:

tests/run/lazyVals_c3.0.0.check

@@ -0,0 +1,4 @@
+computing x
+x
+computing y
+y

tests/run/lazyVals_c3.0.0.scala

@@ -0,0 +1,13 @@
+// Compiled with 3.0.0 and run with current compiler
+class Foo:
+  lazy val x =
+    println("computing x")
+    "x"
+  lazy val y =
+    println("computing y")
+    "y"
+
+@main def Test =
+  val foo = new Foo
+  println(foo.x)
+  println(foo.y)

tests/run/lazyVals_c3.1.0.check

@@ -0,0 +1,4 @@
+computing x
+x
+computing y
+y

tests/run/lazyVals_c3.1.0.scala

@@ -0,0 +1,13 @@
+// Compiled with 3.1.0 and run with current compiler
+class Foo:
+  lazy val x =
+    println("computing x")
+    "x"
+  lazy val y =
+    println("computing y")
+    "y"
+
+@main def Test =
+  val foo = new Foo
+  println(foo.x)
+  println(foo.y)