Skip to content

Several fixes to box inference #16141

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 18 commits into from
Oct 15, 2022
Merged

Several fixes to box inference #16141

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3750dc6
refactor box adaptation
Linyxus Sep 28, 2022
ecf174b
refactor box inference again
Linyxus Sep 28, 2022
0c96672
always box args of HKTypeLambda
Linyxus Sep 28, 2022
297301c
debug tracing for box adaptation
Linyxus Sep 28, 2022
e0afeb9
cleanup
Linyxus Sep 28, 2022
f2bc25e
Revert "always box args of HKTypeLambda"
Linyxus Sep 28, 2022
43ca7c6
strip nested capturing types before box adaptation
Linyxus Sep 28, 2022
ae3f52e
update check files after refactoring box adaptation
Linyxus Sep 28, 2022
023283d
add box adaptation for poly functions
Linyxus Oct 3, 2022
daf6766
update test check files
Linyxus Oct 3, 2022
363f142
refactor box adaptation
Linyxus Oct 4, 2022
577b3a5
documenting box adaptation functions
Linyxus Oct 4, 2022
3be18f5
add box adaptation test cases
Linyxus Oct 4, 2022
21e90e2
Fix doc
Linyxus Oct 11, 2022
7deb2b0
use named arg for nestedInOwner
Linyxus Oct 12, 2022
0cf2f20
rename cs1 to leaked for better readability
Linyxus Oct 12, 2022
3e690a8
remove markSolved
Linyxus Oct 13, 2022
65e42d3
destruct expected type as (type-)functions with more rationale
Linyxus Oct 14, 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
Next Next commit
Revert "always box args of HKTypeLambda" 
This reverts commit 0c96672.
  • Loading branch information
@Linyxus
Linyxus committed Sep 28, 2022
commit f2bc25eb9de96c5ac766ea5b21a52e5c81326a73
4 changes: 2 additions & 2 deletions compiler/src/dotty/tools/dotc/core/TypeApplications.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import util.Stats._
import Names._
import Flags.{Module, Provisional}
import dotty.tools.dotc.config.Config
import cc.{boxedUnlessFun, boxed}
import cc.boxedUnlessFun

object TypeApplications {

Expand Down Expand Up @@ -346,7 +346,7 @@ class TypeApplications(val self: Type) extends AnyVal {
}
if ((dealiased eq stripped) || followAlias)
try
val instantiated = dealiased.instantiate(args.mapConserve(_.boxed))
val instantiated = dealiased.instantiate(args.mapConserve(_.boxedUnlessFun(self)))
if (followAlias) instantiated.normalized else instantiated
catch
case ex: IndexOutOfBoundsException =>
Expand Down