Skip to content

Commit 4bcad56

Browse files
committed
Fix safe-init error in Trees.scala
Fixes the following safe-init error that occurs during bootstrapping: ``` [error] -- Error: /***********/dotty/compiler/src/dotty/tools/dotc/ast/Trees.scala:815:22 [error] 815 | assert(isEmpty || tpt != genericEmptyTree[T]) [error] | ^^^^^^^^^^^^^^^^^^^^^^^^^^ [error] |Call method ValDef.this.tpt.!=(dotty.tools.dotc.ast.Trees.genericEmptyTree[T]) on a value with an unknown initialization. Calling trace: [error] |-> @sharable val theEmptyValDef = new EmptyValDef[Type]() [ Trees.scala:970 ] [error] | ^^^^^^^^^^^^^^^^^^^^^^^ [error] |-> class EmptyValDef[T >: Untyped] extends ValDef[T]( [ Trees.scala:961 ] [error] | ^ [error] |-> case class ValDef[-T >: Untyped] private[ast] (name: TermName, tpt: Tree[T], private var preRhs: LazyTree[T @uncheckedVariance])(implicit @constructorOnly src: SourceFile) [ Trees.scala:812 ] [error] | ^ [error] |-> assert(isEmpty || tpt != genericEmptyTree[T]) [ Trees.scala:815 ] [error] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [error] |-> if !assertion then scala.runtime.Scala3RunTime.assertFailed() [ Predef.scala:10 ] ```
1 parent 924b58e commit 4bcad56

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

compiler/src/dotty/tools/dotc/ast/Trees.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ object Trees {
812812
case class ValDef[-T >: Untyped] private[ast] (name: TermName, tpt: Tree[T], private var preRhs: LazyTree[T @uncheckedVariance])(implicit @constructorOnly src: SourceFile)
813813
extends ValOrDefDef[T], ValOrTypeDef[T] {
814814
type ThisTree[-T >: Untyped] = ValDef[T]
815-
assert(isEmpty || tpt != genericEmptyTree)
815+
assert(isEmpty || (tpt ne genericEmptyTree))
816816
def unforced: LazyTree[T] = preRhs
817817
protected def force(x: Tree[T @uncheckedVariance]): Unit = preRhs = x
818818
}
@@ -822,7 +822,7 @@ object Trees {
822822
paramss: List[ParamClause[T]], tpt: Tree[T], private var preRhs: LazyTree[T @uncheckedVariance])(implicit @constructorOnly src: SourceFile)
823823
extends ValOrDefDef[T] {
824824
type ThisTree[-T >: Untyped] = DefDef[T]
825-
assert(tpt != genericEmptyTree)
825+
assert(tpt ne genericEmptyTree)
826826
def unforced: LazyTree[T] = preRhs
827827
protected def force(x: Tree[T @uncheckedVariance]): Unit = preRhs = x
828828

0 commit comments

Comments
 (0)