This repository was archived by the owner on Jul 12, 2024. It is now read-only.
Merge WasmExpressionBuilder and WasmFunctionContext into FunctionEmitter. #125
Conversation
This file contains 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
Merged
`SWasmGen` has the same role as `SJSGen` in the JS backend: producing Wasm fragments that are specific to the linker encoding, but used across several other components (notably, `ClassEmitter` and `WasmExpressionBuilder`).
This removes one more use of synthetic IR trees in `ClassEmitter`.
|
Rebased. |
tanishiking
approved these changes
May 14, 2024
| @@ -210,22 +214,38 @@ const scalaJSHelpers = { | |||
|
|
|||
| // Non-native JS class support | |||
| newSymbol: Symbol, | |||
| createJSClass: (data, superClass, preSuperStats, superArgs, postSuperStats) => { | |||
| createJSClass: (data, superClass, preSuperStats, superArgs, postSuperStats, fields) => { | |||
There was a problem hiding this comment.
[note]
fields is the array that, even index (including 0) contains the field name, and odd index contains the initial value
| instrs ++= ctx.getConstantStringInstr(value) | ||
|
|
||
| case IRTrees.VarRef(IRTrees.LocalIdent(localName)) | ||
| if classCaptureParamsOfTypeAny.contains(localName) => |
There was a problem hiding this comment.
Why we need this condition in this case?
There was a problem hiding this comment.
Because in theory we could have a reference to a class capture of a type different than Any. In that case, we would need adapt to fix up the type, and that means we need a full expression builder/function emitter.
There was a problem hiding this comment.
we would need adapt to fix up the type,
Ah, right, thanks!
Instead of including it in `postSuperStats`. With this change, the `nameTree` of fields is evaluated in the same context as all the other `nameTree`s. This will make it easier to extract name evaluation.
In general, they can contain local variable definitions. These must not be defined in the same scope as the `createJSClass` function body, since they could clash with each other and/or with the class captures. Instead, in the general case, we extract them in separate functions, which we immediately call. For the common cases of string literals and direct reference to a class capture, we avoid the extra function. This treatment is similar to what the JS backend does, except the latter defines the "separate functions" inline, as immediatly invoked function expressions (IIFEs).
Now that we got rid of all the uses of the expression builder inside it, we can directly use a `FunctionBuilder`. This was the last place where we mixed IR-derived local names and codegen-chosen local names, as evidenced by the removal of the last public method `addLocal` in `WasmFunctionContext`.
The previous entry points `generateIRBody` and `generateBlockStats` are now private. Instead, `WasmExpressionBuilder` exposes `emitFunction` (the main entry point) and `emitJSConstructionFunctions` (a special alternative for the 3 functions that make up a JS constructor def). These entry points instantiate their own `WasmFunctionContext`, which is never used anywhere else anymore.
…ter. The combined class has the same responsibilities as the `FunctionEmitter` in the JS backend.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The combined class has the same responsibilities as the
FunctionEmitterin the JS backend.Based on #124, but otherwise ready to review.