Restrict usages of StoreModule even further. #5059
Merged
Conversation
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
gzm0
requested changes
Nov 2, 2024
linker/shared/src/main/scala/org/scalajs/linker/checker/ClassDefChecker.scala
Show resolved
Hide resolved
| @@ -331,9 +331,7 @@ private final class ClassDefChecker(classDef: ClassDef, | |||
| val envJustBeforeSuper = checkBlockStats(body.beforeSuper, startEnv) | |||
| checkTreeOrSpreads(body.superCall.args, envJustBeforeSuper) | |||
| val envJustAfterSuper = envJustBeforeSuper.withThisType(instanceThisType) | |||
| val afterSuperStoreModulesHandled = | |||
| handleStoreModulesAfterSuperCtorCall(body.afterSuper) | |||
| checkBlockStats(afterSuperStoreModulesHandled, envJustAfterSuper) | |||
There was a problem hiding this comment.
As I commented on #5057, I don't think we should do this (but start emitting store module for JS modules as well).
There was a problem hiding this comment.
Add a test that tests a StoreModule at the top level after the the super ctor call (but not immediately after) is not allowed.
837a819 to
b483cb6
Compare
85a8eb5 to
68bfc6f
Compare
gzm0
approved these changes
Nov 3, 2024
* Must appear exactly once, right after the super constructor call, in module classes. * Cannot appear anywhere else. This was not actually the case for JS module classes. We never emitted `StoreModule`s in JS constructors. We use a deserialization hack to introduce them, and add tests for the corner case that `StoreModule` is meant to solve. In this commit, we always enable the deserialization hack, and do not change the compiler yet.
And only enable the deserialization when reading IR < 1.18.
85a8eb5 to
ff197d8
Compare
|
Fixed scalastyle 🤦♂️ |
sjrd
added a commit
to dotty-staging/dotty
that referenced
this pull request
Jan 17, 2025
And port the changes that were made to the compiler backend. Most nobably, the changes from the following upstream PRs: * Introduce non-nullable reference types in the IR. scala-js/scala-js#5018 * Opt: Remove useless *Ident indirections in the IR model. scala-js/scala-js#5092 * Merge the IR node This into VarRef, with a magic LocalName. scala-js/scala-js#5090 * Merge several IR nodes into UnaryOp. scala-js/scala-js#5088 * Restrict usages of StoreModule even further. scala-js/scala-js#5059 * Allow Return arg to be a void if the target Labeled is a void. scala-js/scala-js#5074 * Rename NoType to VoidType and print it as "void". scala-js/scala-js#5061
sjrd
added a commit
to dotty-staging/dotty
that referenced
this pull request
Jan 17, 2025
And port the changes that were made to the compiler backend. Most notably, the changes from the following upstream PRs: * Introduce non-nullable reference types in the IR. scala-js/scala-js#5018 * Opt: Remove useless *Ident indirections in the IR model. scala-js/scala-js#5092 * Merge the IR node This into VarRef, with a magic LocalName. scala-js/scala-js#5090 * Merge several IR nodes into UnaryOp. scala-js/scala-js#5088 * Restrict usages of StoreModule even further. scala-js/scala-js#5059 * Allow Return arg to be a void if the target Labeled is a void. scala-js/scala-js#5074 * Rename NoType to VoidType and print it as "void". scala-js/scala-js#5061
sjrd
added a commit
to scala/scala3
that referenced
this pull request
Jan 22, 2025
And port the changes that were made to the compiler backend. Most notably, the changes from the following upstream PRs: * scala-js/scala-js#5018 * scala-js/scala-js#5092 * scala-js/scala-js#5090 * scala-js/scala-js#5088 * scala-js/scala-js#5059 * scala-js/scala-js#5074 * scala-js/scala-js#5061
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Alternative to #5057. The first commit is the same as the one in #5057.