(0.46) Move anchored instanceof to the correct position #19655
Merged
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
This commit includes the following two changes in ILGen: 1. If the class is unresolved, `genInstanceof` anchors `instanceof` under a `treetop` node. Then the anchored `instanceof` treetop appears after the callTree and it commons with the `instanceof` node under the `ZEROCHK` in `geninterface`. This causes a problem because `expandUnresolvedClassInstanceof` does not expect the treetop that has the anchored `instanceof` to have already been evaluated when it appears under ZEROCHK. The transformation in `expandUnresolvedClassInstanceof` will not function correctly. Therefore, the anchored `instanceof` treetop needs to be moved up before ZEROCHK. 2. If the receiver of the `instanceof` is non-null, there is no need to transform the `instanceof` into two cases: the null case and the non-null cases in `expandUnresolvedClassInstanceof`. Fixes: eclipse-openj9#18748 Signed-off-by: Annabelle Huo <Annabelle.Huo@ibm.com>
|
@hzongaro May I ask you to review this change for 0.46? Thank you! |
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.
This PR ports #19604 to 0.46
This commit includes the following two changes in ILGen:
If the class is unresolved,
genInstanceofanchorsinstanceofunder atreetopnode. Then the anchoredinstanceoftreetop appears after the callTree and it commons withthe
instanceofnode under theZEROCHKingeninterface.This causes a problem because
expandUnresolvedClassInstanceofdoes not expect the treetop that has the anchoredinstanceofto have already been evaluated when it appears under ZEROCHK. The transformation inexpandUnresolvedClassInstanceofwill not function correctly.Therefore, the anchored
instanceoftreetop needs to be moved up before ZEROCHK.If the receiver of the
instanceofis non-null, there is no need to transform theinstanceofinto two cases: the null case and the non-null cases inexpandUnresolvedClassInstanceof.Fixes: #18748