8263642: javac emits duplicate checkcast for first bound of intersection type in cast #3399

lgxbslgx · 2021-04-08T16:29:04Z

Hi all,

Before the phase desugar, the demo (C1 & I1) o has one type-cast sub-tree, JCTypeIntersection C1&I1, at the syntax tree. After the phase desugar, the (C1 & I1) o becomes three type-cast sub-trees: JCTypeIntersection C1&I1, I1, C1. So at phase Gen, javac generates three checkcast according to the three type-cast sub-trees which causes this bug.

This patch doesn't generate checkcast when the type is JCTypeIntersection so that the problem can be solved. And a corresponding test case is added.

Another way to solve this issue is that the TransTypes of the desugar should be modified and two type-cast sub-trees should be generated instead of three. But this way may change more code than my original patch and may cause other regression.

Thank you for taking the time to review.

Best Regards.
--Guoxiong

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8263642: javac emits duplicate checkcast for first bound of intersection type in cast

Reviewers

Vicente Romero (@vicente-romero-oracle - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3399/head:pull/3399
$ git checkout pull/3399

Update a local copy of the PR:
$ git checkout pull/3399
$ git pull https://git.openjdk.java.net/jdk pull/3399/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3399

View PR using the GUI difftool:
$ git pr show -t 3399

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3399.diff

…ion type in cast

bridgekeeper · 2021-04-08T16:30:08Z

👋 Welcome back lgxbslgx! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2021-04-08T21:24:17Z

@lgxbslgx The following label will be automatically applied to this pull request:

compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2021-04-08T21:28:34Z

Webrevs

bridgekeeper · 2021-05-06T22:09:57Z

@lgxbslgx This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

lgxbslgx · 2021-05-11T01:46:09Z

Ping. Could I ask your help to review this patch? Thanks a lot.

vicente-romero-oracle · 2021-06-02T04:40:46Z

test/langtools/tools/javac/cast/intersection/DuplicatedCheckcastTest.java

+                Code_attribute code_attribute = (Code_attribute) method.attributes.get(Attribute.Code);
+                for (Instruction instruction : code_attribute.getInstructions()) {
+                    if ("checkcast".equals(instruction.getMnemonic())) {
+                        checkcastNumber++;


I think that the test should check not only for the number of checkcast but also for the type the checkcast is checking against.

vicente-romero-oracle · 2021-06-02T04:44:14Z

src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java

@@ -2221,7 +2221,8 @@ public void visitTypeCast(JCTypeCast tree) {
        // the conversion.
        if (!tree.clazz.type.isPrimitive() &&
           !types.isSameType(tree.expr.type, tree.clazz.type) &&
-           types.asSuper(tree.expr.type, tree.clazz.type.tsym) == null) {
+           types.asSuper(tree.expr.type, tree.clazz.type.tsym) == null &&
+           tree.clazz.getTag() != TYPEINTERSECTION) {


I think that if the right form of the AST is one that have only two type casts, then that's what the fix should be doing

I revised the patch to adjust the AST. Now it has only two type casts instead of three.

lgxbslgx · 2021-06-02T15:23:24Z

@vicente-romero-oracle Thanks for your review. I updated the patch just now.

vicente-romero-oracle · 2021-06-02T16:12:40Z

test/langtools/tools/javac/cast/intersection/DuplicatedCheckcastTest.java

+            throw new AssertionError("The number of the instruction 'checkcast' is not right. " +
+                    "Expected number: 2, actual number: " + checkCastList.size());
+        }
+        // first checkcast


hi, there is common code in the two sections of code that check for the checkcast I suggest creating a method for the common code

vicente-romero-oracle

looks good

openjdk · 2021-06-02T16:56:39Z

@lgxbslgx This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8263642: javac emits duplicate checkcast for first bound of intersection type in cast

Reviewed-by: vromero

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 4 new commits pushed to the master branch:

e1462e7: 8267176: StandardDoclet should provide access to Reporter and Locale
56b65e4: 8267569: java.io.File.equals contains misleading Javadoc
508cec7: 8267521: Post JEP 411 refactoring: maximum covering > 50K
40d23a0: 8267543: Post JEP 411 refactoring: security

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@vicente-romero-oracle) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

lgxbslgx · 2021-06-02T17:01:24Z

@vicente-romero-oracle Thanks for your review. Could I get your help to sponsor this patch?

/integrate

openjdk · 2021-06-02T17:02:42Z

@lgxbslgx
Your change (at version 5f4f5bb) is now ready to be sponsored by a Committer.

vicente-romero-oracle · 2021-06-02T17:16:12Z

/sponsor

vicente-romero-oracle · 2021-06-02T17:16:49Z

@vicente-romero-oracle Thanks for your review. Could I get your help to sponsor this patch?

/integrate

sure, done

openjdk · 2021-06-02T17:17:58Z

@vicente-romero-oracle @lgxbslgx Since your change was applied there have been 4 commits pushed to the master branch:

e1462e7: 8267176: StandardDoclet should provide access to Reporter and Locale
56b65e4: 8267569: java.io.File.equals contains misleading Javadoc
508cec7: 8267521: Post JEP 411 refactoring: maximum covering > 50K
40d23a0: 8267543: Post JEP 411 refactoring: security

Your commit was automatically rebased without conflicts.

Pushed as commit b7ac705.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

8263642: javac emits duplicate checkcast for first bound of intersect…

f57b0c3

…ion type in cast

openjdk bot added the rfr Pull request is ready for review label Apr 8, 2021

openjdk bot added the compiler compiler-dev@openjdk.org label Apr 8, 2021

vicente-romero-oracle suggested changes Jun 2, 2021

View reviewed changes

lgxbslgx added 3 commits June 2, 2021 22:35

Merge branch 'master' into JDK-8263642

12b7087

Check the type of the checkcast

ef63bcf

Remove the duplicated typecast nodes in the AST instead of ignoring it

0806d1b

vicente-romero-oracle reviewed Jun 2, 2021

View reviewed changes

Encapsulate common code to a method

5f4f5bb

vicente-romero-oracle approved these changes Jun 2, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 2, 2021

openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 2, 2021

openjdk bot closed this Jun 2, 2021

openjdk bot added integrated Pull request has been integrated and removed sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 2, 2021

lgxbslgx deleted the JDK-8263642 branch June 2, 2021 17:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8263642: javac emits duplicate checkcast for first bound of intersection type in cast #3399

8263642: javac emits duplicate checkcast for first bound of intersection type in cast #3399

lgxbslgx commented Apr 8, 2021 •

edited by openjdk bot

Loading

bridgekeeper bot commented Apr 8, 2021

openjdk bot commented Apr 8, 2021

mlbridge bot commented Apr 8, 2021 •

edited

Loading

bridgekeeper bot commented May 6, 2021

lgxbslgx commented May 11, 2021

vicente-romero-oracle Jun 2, 2021

lgxbslgx Jun 2, 2021

vicente-romero-oracle Jun 2, 2021

lgxbslgx Jun 2, 2021

lgxbslgx commented Jun 2, 2021

vicente-romero-oracle Jun 2, 2021

lgxbslgx Jun 2, 2021

vicente-romero-oracle left a comment

openjdk bot commented Jun 2, 2021 •

edited

Loading

lgxbslgx commented Jun 2, 2021

openjdk bot commented Jun 2, 2021

vicente-romero-oracle commented Jun 2, 2021

vicente-romero-oracle commented Jun 2, 2021

openjdk bot commented Jun 2, 2021

8263642: javac emits duplicate checkcast for first bound of intersection type in cast #3399

8263642: javac emits duplicate checkcast for first bound of intersection type in cast #3399

Conversation

lgxbslgx commented Apr 8, 2021 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Apr 8, 2021

openjdk bot commented Apr 8, 2021

mlbridge bot commented Apr 8, 2021 • edited Loading

Webrevs

bridgekeeper bot commented May 6, 2021

lgxbslgx commented May 11, 2021

vicente-romero-oracle Jun 2, 2021

Choose a reason for hiding this comment

lgxbslgx Jun 2, 2021

Choose a reason for hiding this comment

vicente-romero-oracle Jun 2, 2021

Choose a reason for hiding this comment

lgxbslgx Jun 2, 2021

Choose a reason for hiding this comment

lgxbslgx commented Jun 2, 2021

vicente-romero-oracle Jun 2, 2021

Choose a reason for hiding this comment

lgxbslgx Jun 2, 2021

Choose a reason for hiding this comment

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

openjdk bot commented Jun 2, 2021 • edited Loading

lgxbslgx commented Jun 2, 2021

openjdk bot commented Jun 2, 2021

vicente-romero-oracle commented Jun 2, 2021

vicente-romero-oracle commented Jun 2, 2021

openjdk bot commented Jun 2, 2021

lgxbslgx commented Apr 8, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Apr 8, 2021 •

edited

Loading

openjdk bot commented Jun 2, 2021 •

edited

Loading