Skip to content

WIP - Fix init soundness #13471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

WIP - Fix init soundness #13471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
893892f
Update tests
EnzeXing Aug 25, 2021
6cf3966
Add worklist and refactor definition for ThisRef
liufengyun Sep 4, 2021
7c0f53e
Rename Addr to Ref
liufengyun Sep 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 22 additions & 32 deletions compiler/src/dotty/tools/dotc/transform/init/Checker.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,33 +33,38 @@ class Checker extends Phase {

override def runOn(units: List[CompilationUnit])(using Context): List[CompilationUnit] =
units.foreach { unit => traverser.traverse(unit.tpdTree) }
semantic.check()
super.runOn(units)

def run(using Context): Unit = {
// ignore, we already called `semantic.check()` in `runOn`
}

val traverser = new TreeTraverser {
override def traverse(tree: Tree)(using Context): Unit =
traverseChildren(tree)
tree match {
case tdef: MemberDef =>
case mdef: MemberDef =>
// self-type annotation ValDef has no symbol
if tdef.name != nme.WILDCARD then
tdef.symbol.defTree = tree
if mdef.name != nme.WILDCARD then
mdef.symbol.defTree = tree

mdef match
case tdef: TypeDef if tdef.isClassDef =>
import semantic._
val cls = tdef.symbol.asClass
val ctor = cls.primaryConstructor
val args = ctor.defTree.asInstanceOf[DefDef].termParamss.flatten.map(_ => Hot)
val outer = Hot
val thisRef = ThisRef(cls, outer, ctor, args)
if shouldCheckClass(cls) then semantic.addTask(thisRef)(using Trace.empty)
case _ =>

case _ =>
}
}

override def run(using Context): Unit = {
val unit = ctx.compilationUnit
unit.tpdTree.foreachSubTree {
case tdef: TypeDef if tdef.isClassDef =>
transformTypeDef(tdef)

case _ =>
}
}


private def transformTypeDef(tree: TypeDef)(using Context): tpd.Tree = {
val cls = tree.symbol.asClass
private def shouldCheckClass(cls: ClassSymbol)(using Context) = {
val instantiable: Boolean =
cls.is(Flags.Module) ||
!cls.isOneOf(Flags.AbstractOrTrait) && {
Expand All @@ -71,21 +76,6 @@ class Checker extends Phase {
}

// A concrete class may not be instantiated if the self type is not satisfied
if (instantiable && cls.enclosingPackageClass != defn.StdLibPatchesPackage.moduleClass) {
import semantic._
val tpl = tree.rhs.asInstanceOf[Template]
val thisRef = ThisRef(cls).ensureExists

val paramValues = tpl.constr.termParamss.flatten.map(param => param.symbol -> Hot).toMap

given Promoted = Promoted.empty
given Trace = Trace.empty
given Env = Env(paramValues)

val res = eval(tpl, thisRef, cls)
res.errors.foreach(_.issue)
}

tree
instantiable && cls.enclosingPackageClass != defn.StdLibPatchesPackage.moduleClass
}
}
Loading