Allocate all emitter var field strings statically #4911
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
|
Based on #4909 due to merge conflicts. |
Dispatchers are the only place where we pass a dynamically computed string to the VarGen subsystem.
sjrd
requested changes
Oct 16, 2023
| * | ||
| * Also gives us additional compile-time safety against typos. | ||
| */ | ||
| private[emitter] final class VarFld private (val str: String) extends AnyVal |
There was a problem hiding this comment.
Any reason not to call this VarField in full?
Suggested change
| private[emitter] final class VarFld private (val str: String) extends AnyVal | |
| private[emitter] final class VarField private (val str: String) extends AnyVal |
There was a problem hiding this comment.
Only brevity. And it's true that saving 2 chars is likely not worth the additional abbreviation.
| private[emitter] final class VarFld private (val str: String) extends AnyVal | ||
|
|
||
| object VarFld { | ||
| def mk(str: String): VarFld = { |
There was a problem hiding this comment.
Suggested change
| def mk(str: String): VarFld = { | |
| private def mk(str: String): VarFld = { |
| /** Scala class constructors (<init>). */ | ||
| final val ct = mk("$ct") | ||
|
|
||
| /** Scala class initializers (<cinit>). */ |
There was a problem hiding this comment.
Suggested change
| /** Scala class initializers (<cinit>). */ | |
| /** Scala class initializers (<clinit>). */ |
| /** Scala module accessor. */ | ||
| final val m = mk("$m") | ||
|
|
||
| /** Var / let to store Scala module instnance. |
There was a problem hiding this comment.
Suggested change
| /** Var / let to store Scala module instnance. | |
| /** Var / let to store Scala module instance. |
| /** Class data. */ | ||
| final val d = mk("$d") | ||
|
|
||
| /** inInstanceOf functions. |
There was a problem hiding this comment.
Suggested change
| /** inInstanceOf functions. | |
| /** isInstanceOf functions. |
|
|
||
| final val moduleDefault = mk("$moduleDefault") | ||
|
|
||
| // Arithemtic Call Helpers |
There was a problem hiding this comment.
Suggested change
| // Arithemtic Call Helpers | |
| // Arithmetic Call Helpers |
|
I have addressed all the comments. I have also added |
sjrd
approved these changes
Oct 18, 2023
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.
Memory profile analysis shows ~120k duplicates of the string "$n" amounting to ~6MB waste (on the test suite).
Further digging revealed that this happens through the "$n" call-helper (null check) via:
By defining the relevant strings statically (including the leading
$), we avoid the duplication.Discovered while working on #4906.