Clean-up the new lazy vals

szymon-rd · szymon-rd · commit f62ffd8eecc5 · 2022-10-28T16:02:55.000+02:00
diff --git a/bench-micro/results_isStable.json b/bench-micro/results_isStable.json
diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -1990,6 +1990,12 @@ class Definitions {
     addSyntheticSymbolsComments
   }
 
+  /** Definitions used in Lazy Vals implementation */
+  val LazyValsModuleName = "scala.runtime.LazyVals"
+  @tu lazy val LazyValsModule = requiredModule(LazyValsModuleName)
+  @tu lazy val LazyValsWaitingState = requiredClass(s"$LazyValsModuleName.Waiting")
+  @tu lazy val LazyValsControlState = requiredClass(s"$LazyValsModuleName.LazyValControlState")
+
   def addSyntheticSymbolsComments(using Context): Unit =
     def add(sym: Symbol, doc: String) = ctx.docCtx.foreach(_.addDocstring(sym, Some(Comment(NoSpan, doc))))
 
diff --git a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala
diff --git a/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala b/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala
@@ -498,6 +498,7 @@ class TreeChecker extends Phase with SymTransformer {
       def isAllowed(sym: Symbol): Boolean = sym.is(ConstructorProxy)
 
       val symbolsNotDefined = (decls -- defined - constr.symbol).filterNot(isAllowed)
+
       assert(symbolsNotDefined.isEmpty,
         i" $cls tree does not define members: ${symbolsNotDefined.toList}%, %\n" +
         i"expected: ${decls.toList}%, %\n" +
diff --git a/compiler/test/dotc/pos-lazy-vals-tests.allowlist b/compiler/test/dotc/pos-lazy-vals-tests.allowlist
@@ -34,4 +34,4 @@ t6278-synth-def.scala
 t6925b.scala
 t7011.scala
 t8306.scala
-zipped.scala
+zipped.scala
diff --git a/compiler/test/dotc/run-from-tasty.blacklist b/compiler/test/dotc/run-from-tasty.blacklist
@@ -1,2 +1,2 @@
 # CI only: cannot reduce summonFrom with
-sip23-valueof.scala
+sip23-valueof.scala
diff --git a/compiler/test/dotc/run-lazy-vals-tests.allowlist b/compiler/test/dotc/run-lazy-vals-tests.allowlist
@@ -63,4 +63,4 @@ t7406.scala
 t8245.scala
 unapply.scala
 unit-lazy-val.scala
-view-iterator-stream.scala
+view-iterator-stream.scala
diff --git a/compiler/test/dotc/run-test-pickling.blacklist b/compiler/test/dotc/run-test-pickling.blacklist
@@ -43,4 +43,4 @@ i12753
 t6138
 t6138-2
 i12656.scala
-trait-static-forwarder
+trait-static-forwarder
diff --git a/compiler/test/dotc/run-test-recheck.excludes b/compiler/test/dotc/run-test-recheck.excludes
@@ -10,4 +10,4 @@ i5976.scala
 tagless.scala
 safeThrowsStrawman2.scala
 t7584.scala
-function-arity.scala
+function-arity.scala
diff --git a/library/src/scala/runtime/LazyVals.scala b/library/src/scala/runtime/LazyVals.scala
@@ -163,20 +163,11 @@ object LazyVals {
 
 
   object Names {
-    final val controlState = "LazyValControlState"
-    final val waiting = "Waiting"
-    final val evaluating = "Evaluating"
-    final val nullValue = "NullValue"
-    final val waitingAwaitRelease = "await"
-    final val waitingRelease = "countDown"
     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 getOffsetStatic = "getOffsetStatic"
-    final val getStaticFieldOffset = "getStaticFieldOffset"
   }
 }
diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala
@@ -5,20 +5,9 @@ object MiMaFilters {
   val Library: Seq[ProblemFilter] = Seq(
     ProblemFilters.exclude[MissingClassProblem]("scala.annotation.internal.MappedAlternative"),
 
-    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.getStaticOffset"),
-    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.getOffsetStatic"),
     ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.getStaticFieldOffset"),
-    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.getStaticFieldOffset"),
     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.nullValue"),
-    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$LazyValControlState"),
-    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.controlState"),
     ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$Evaluating$"),
     ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$NullValue$"),
     ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$Waiting"),
diff --git a/tests/printing/transformed/lazy-vals-legacy.scala b/tests/printing/transformed/lazy-vals-legacy.scala
@@ -1,3 +1,3 @@
 object A {
     lazy val x: Int = 2
-}
+}
diff --git a/tests/printing/transformed/lazy-vals-new.check b/tests/printing/transformed/lazy-vals-new.check
@@ -22,20 +22,20 @@ package <empty> {
       )
     private def writeReplace(): Object = 
       new scala.runtime.ModuleSerializationProxy(classOf[A])
-    @volatile lazy <static> var x$lzy1: Object = null
+    @volatile private lazy <static> var x$lzy1: Object = null
     lazy def x(): Int = 
       {
-        var result: Object = A#x$lzy1
-        if result.isInstanceOf[Int] then return scala.Int.unbox(result) else 
-          if result.==(scala.runtime.LazyVals.NullValue) then 
-            return scala.Int.unbox(null)
-           else return scala.Int.unbox(A.x$lzyINIT1())
+        val result: Object = A#x$lzy1
+        if result.isInstanceOf[Int] then scala.Int.unbox(result) else 
+          if result.eq(scala.runtime.LazyVals.NullValue) then 
+            scala.Int.unbox(null)
+           else scala.Int.unbox(A.x$lzyINIT1())
       }
     private def x$lzyINIT1(): Object = 
       while <empty> do 
         {
           val current: Object = A#x$lzy1
-          if current.==(null) then 
+          if current.eq(null) then 
             if 
               scala.runtime.LazyVals.objCAS(classOf[A], A.OFFSET$_m_0, null, 
                 scala.runtime.LazyVals.Evaluating
@@ -47,31 +47,29 @@ package <empty> {
                 try 
                   {
                     resultNullable = scala.Int.box(2)
-                    if resultNullable.==(null) then 
+                    if resultNullable.eq(null) then 
                       result = scala.runtime.LazyVals.NullValue
                      else result = resultNullable
-                    return resultNullable
+                    ()
                   }
                  finally 
-                  {
-                    if 
+                  if 
+                    scala.runtime.LazyVals.objCAS(classOf[A], A.OFFSET$_m_0, 
+                      scala.runtime.LazyVals.Evaluating
+                    , result).unary_!()
+                   then 
+                    {
+                      val lock: scala.runtime.LazyVals.LazyVals$Waiting = 
+                        A#x$lzy1.asInstanceOf[
+                          scala.runtime.LazyVals.LazyVals$Waiting
+                        ]
                       scala.runtime.LazyVals.objCAS(classOf[A], A.OFFSET$_m_0, 
-                        scala.runtime.LazyVals.Evaluating
-                      , result).unary_!()
-                     then 
-                      {
-                        val lock: scala.runtime.LazyVals.LazyVals$Waiting = 
-                          A#x$lzy1.asInstanceOf[
-                            scala.runtime.LazyVals.LazyVals$Waiting
-                          ]
-                        scala.runtime.LazyVals.objCAS(classOf[A], A.OFFSET$_m_0
-                          , 
-                        lock, result)
-                        lock.countDown()
-                      }
-                     else ()
-                    ()
-                  }
+                        lock
+                      , result)
+                      lock.countDown()
+                    }
+                   else ()
+                return resultNullable
               }
              else ()
            else 
@@ -80,10 +78,10 @@ package <empty> {
                 scala.runtime.LazyVals.LazyVals$LazyValControlState
               ]
              then 
-              if current.==(scala.runtime.LazyVals.Evaluating) then 
+              if current.eq(scala.runtime.LazyVals.Evaluating) then 
                 {
                   scala.runtime.LazyVals.objCAS(classOf[A], A.OFFSET$_m_0, 
-                    scala.runtime.LazyVals.Evaluating
+                    current
                   , new scala.runtime.LazyVals.LazyVals$Waiting())
                   ()
                 }
@@ -94,10 +92,7 @@ package <empty> {
                   current.asInstanceOf[scala.runtime.LazyVals.LazyVals$Waiting].
                     await
                   ()
-                 else 
-                  if current.==(scala.runtime.LazyVals.NullValue) then 
-                    return null
-                   else ()
+                 else return null
              else return current
         }
   }
diff --git a/tests/printing/transformed/lazy-vals-new.flags b/tests/printing/transformed/lazy-vals-new.flags
@@ -1 +1 @@
--Ylightweight-lazy-vals
+-Ylightweight-lazy-vals
diff --git a/tests/printing/transformed/lazy-vals-new.scala b/tests/printing/transformed/lazy-vals-new.scala
@@ -1,3 +1,3 @@
 object A {
     lazy val x: Int = 2
-}
+}
diff --git a/tests/run/lazyVals_c3.1.0.scala b/tests/run/lazyVals_c3.1.0.scala
@@ -10,4 +10,4 @@ class Foo:
 @main def Test =
   val foo = new Foo
   println(foo.x)
-  println(foo.y)
+  println(foo.y)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# CI only: cannot reduce summonFrom with`
`2`		`-sip23-valueof.scala`
	`2`	`+sip23-valueof.scala`