Skip to content

Fix #6822: Fix self type handling for opaque types in classes #6857

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 3 commits into from
Jul 16, 2019
Merged

Fix #6822: Fix self type handling for opaque types in classes #6857

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
44a89c9
Fix #6822: Fix self type handling for opaque types in classes
odersky Jul 15, 2019
bcb1f94
Use simpler given self type for opaque types in classes
odersky Jul 16, 2019
6cb3e8f
Pickle only explicitly given self types
odersky Jul 16, 2019
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
5 changes: 3 additions & 2 deletions compiler/src/dotty/tools/dotc/core/SymDenotations.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,8 @@ object SymDenotations {
val enclClassInfo = owner.asClass.classInfo
enclClassInfo.selfInfo match {
case self: Type =>
owner.info = enclClassInfo.derivedClassInfo(selfInfo = refineSelfType(self))
owner.info = enclClassInfo.derivedClassInfo(
selfInfo = refineSelfType(self.orElse(defn.AnyType)))
case self: Symbol =>
self.info = refineSelfType(self.info)
}
Expand Down Expand Up @@ -1177,7 +1178,7 @@ object SymDenotations {
case _ =>
NoType
}
recur(owner.asClass.classInfo.selfType)
recur(owner.asClass.givenSelfType)
}

/** The non-private symbol whose name and type matches the type of this symbol
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ class TreePickler(pickler: TastyPickler) {
pickleParams(params)
tree.parents.foreach(pickleTree)
val cinfo @ ClassInfo(_, _, _, _, selfInfo) = tree.symbol.owner.info
if ((selfInfo ne NoType) || !tree.self.isEmpty) {
if (!tree.self.isEmpty) {
writeByte(SELFDEF)
pickleName(tree.self.name)

Expand Down
3 changes: 3 additions & 0 deletions tests/pos/i6822.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class C {
opaque type T = Int
}