-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Fix #10769: change synthesized type in def ordinal #10785
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.
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
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1410,6 +1410,33 @@ object SymDenotations { | |
def namedType(using Context): NamedType = | ||
if (isType) typeRef else termRef | ||
|
||
/** The typeRef where `pre.O$.this` is changed to `pre.O.type` if `O` is a non-static object | ||
* | ||
* This is required to avoid owner crash in ExplicitOuter. | ||
* See tests/pos/i10769.scala | ||
*/ | ||
def reachableTypeRef(using Context) = | ||
TypeRef(owner.reachableThisType, symbol) | ||
|
||
/** The termRef where `pre.O$.this` is changed to `pre.O.type` if `O` is a non-static object | ||
* | ||
* This is required to avoid owner crash in ExplicitOuter. | ||
* See tests/pos/i10769.scala | ||
*/ | ||
def reachableTermRef(using Context) = | ||
TermRef(owner.reachableThisType, symbol) | ||
|
||
/** The thisType where `pre.O$.this` is changed to `pre.O.type` if `O` is a non-static object */ | ||
def reachableThisType(using Context): Type = | ||
liufengyun marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if this.is(Package) then | ||
symbol.thisType | ||
else if this.isTerm then | ||
NoPrefix | ||
else if this.is(Module) then | ||
TermRef(owner.reachableThisType, this.sourceModule) | ||
else | ||
ThisType.raw(TypeRef(owner.reachableThisType, symbol.asType)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What abotu the ThisType.raw here? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This one is different, as we need to call |
||
|
||
/** The variance of this type parameter or type member as a subset of | ||
* {Covariant, Contravariant} | ||
*/ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package stm | ||
|
||
trait STMLike[F[_]] { | ||
import Internals._ | ||
|
||
sealed abstract class Txn[+A] {} | ||
|
||
object Txn { | ||
def abort[A](e: Throwable): Txn[A] = Abort(e) | ||
} | ||
|
||
object Internals { | ||
case class Abort(error: Throwable) extends Txn[Nothing] | ||
case object Noop extends Txn[Nothing] | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
package stm | ||
|
||
trait STMLike[F[_]] { | ||
import Internals._ | ||
|
||
sealed abstract class Txn[+A] {} | ||
|
||
object Txn { | ||
def abort[A](e: Throwable): Txn[A] = Abort(e) | ||
} | ||
|
||
object Internals { | ||
case class Abort(error: Throwable) extends Txn[Nothing] | ||
case object Noop extends Txn[Nothing] | ||
} | ||
|
||
class Foo { | ||
case class Abort(error: Throwable) extends Txn[Nothing] | ||
case object Noop extends Txn[Nothing] | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These documentation comments need to be updated since we also do this for static objects now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.