Skip to content

Create boxed environments only for references and function values #16136

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

Merged
merged 5 commits into from
Oct 19, 2022
Merged

Create boxed environments only for references and function values #16136

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08321d4
only create boxed environment for function values and references
Linyxus Oct 16, 2022
7ae54f1
fix boxmap test
Linyxus Oct 3, 2022
4805007
create boxed environment for all ref trees
Linyxus Oct 3, 2022
8bab429
update documentation of recheck about top-level boxes
Linyxus Oct 4, 2022
a25677e
use pattern matching and `closureDef` extractor
Linyxus Oct 16, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
use pattern matching and closureDef extractor
  • Loading branch information
@Linyxus
Linyxus committed Oct 16, 2022
commit a25677eac79a1f88bce5f495b4e442eddfebcd75
21 changes: 6 additions & 15 deletions compiler/src/dotty/tools/dotc/cc/CheckCaptures.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,19 +507,6 @@ class CheckCaptures extends Recheck, SymTransformer:
recheckFinish(result, arg, pt)
*/

extension (tree: Tree)
private def isFunctionLiteral(using Context): Boolean = tree match
case Block((defTree @ DefDef(_, _, _, _)) :: Nil, Closure(_, meth, _)) =>
val defSym = defTree.symbol
val methSym = meth.symbol
defSym.eq(methSym)
case _ =>
false

private def isRefTree: Boolean = tree match
case _: RefTree => true
case _ => false

/** If expected type `pt` is boxed and the tree is a function or a reference,
* don't propagate free variables.
* Otherwise, if the result type is boxed, simulate an unboxing by
Expand All @@ -528,8 +515,12 @@ class CheckCaptures extends Recheck, SymTransformer:
override def recheck(tree: Tree, pt: Type = WildcardType)(using Context): Type =
if tree.isTerm && pt.isBoxedCapturing then
val saved = curEnv
if tree.isRefTree || tree.isFunctionLiteral then
curEnv = Env(curEnv.owner, nestedInOwner = false, CaptureSet.Var(), isBoxed = true, curEnv)

tree match
case _: RefTree | closureDef(_) =>
curEnv = Env(curEnv.owner, nestedInOwner = false, CaptureSet.Var(), isBoxed = true, curEnv)
case _ =>

try super.recheck(tree, pt)
finally curEnv = saved
else
Expand Down