Fix init checker on secondary constructor parameter access #13776
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
natsukagami
changed the title
natsukagami
changed the title
liufengyun
reviewed
Oct 26, 2021
|
Fixed! Please have another look. |
liufengyun
approved these changes
Oct 27, 2021
| @@ -652,6 +652,16 @@ object Semantic { | |||
| } | |||
|
|
|||
| def callConstructor(ctor: Symbol, args: List[ArgInfo], source: Tree): Contextual[Result] = log("call " + ctor.show + ", args = " + args, printer, (_: Result).show) { | |||
| // init "fake" param fields for the secondary constructor | |||
| def addEnvToRef(env: Env, ref: Ref) = { | |||
| val ctorDef = ctor.defTree.asInstanceOf[DefDef] | |||
There was a problem hiding this comment.
Nitpick: We can avoid ctor.defTree.asInstanceOf[DefDef] by passing it from call sites --- there we already have ddef.
Maybe rename addEnvToRef to something like addParamAsField to be more clear?
olhotak
approved these changes
Oct 27, 2021
| def this(b: B, m: Int) = { | ||
| this(b) | ||
| def foo = m // resolved to parameter `m` | ||
| class C { foo } // resolved to parameter `m`, as hidden field of `A` |
There was a problem hiding this comment.
Does this comment belong on the previous line? I don't see how it applies to class C.
There was a problem hiding this comment.
The call to foo here will cause the interpreter to look up m (and from the PR's changes, find m as a hidden field of A)
natsukagami
force-pushed
the
fix-secondary-constructor-crash
branch
2 times, most recently
from
2e3d0fc
to
0bafae2
Compare
liufengyun
reviewed
Nov 3, 2021
- Insert the parameters of the secondary constructor into the `Objekt` of `thisV`, so that they can be looked up when it is referenced. - Add tests
natsukagami
force-pushed
the
fix-secondary-constructor-crash
branch
from
8f67d07
to
1971882
Compare
|
@liufengyun @olhotak I think it is ready, please merge if it looks OK. |
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.
Insert the parameters of the secondary constructor into the
ObjektofthisV, so that they can be looked up when it isreferenced.
An example is provided as a test file.
Upon calling a secondary constructor, we add the
parameters into the cache as if they were fields of
the constructed object (similar to a primary constructor).
Due to the actual fields referenced being resolved to
fully qualified names (but references to parameters are not),
we also change the
accessLocallogic to look at theobject cache first, if we are in a Constructor context.