8057543: Replace javac's Filter with Predicate (and lambdas) #1898

lgxbslgx · 2020-12-27T14:54:16Z

Hi all,

This patch replaces javac's Filter with Predicate and sets Filter as Deprecated.
Two existing tests failed and I fixed it.
Currently, all the tests in test/langtools passed locally by using the following command.

make test CONF=linux-x86_64-server-release JOBS=4 TEST=test/langtools/

Thank you for taking the time to review.

Best Regards.

Progress

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

Issue

JDK-8057543: Replace javac's Filter with Predicate (and lambdas)

Reviewers

Maurizio Cimadamore (@mcimadamore - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1898

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

Using diff file

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

bridgekeeper · 2020-12-27T14:55:04Z

👋 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 · 2020-12-27T14:56:30Z

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

compiler
kulla

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

lgxbslgx · 2020-12-27T14:58:36Z

/label remove kulla

openjdk · 2020-12-27T14:59:09Z

@lgxbslgx
The kulla label was successfully removed.

mlbridge · 2020-12-27T15:02:04Z

Webrevs

lgxbslgx · 2020-12-27T15:31:38Z

More information and some similar issues:

These four issues were fixed in this patch
JDK-8057542
JDK-8057545
JDK-8057546
JDK-8057547

This issue was fixed in this patch
JDK-8057544

But their status are still NEW. It should be revised to RESOLVED or CLOSED.

bridgekeeper · 2021-01-24T15:49:03Z

@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!

bridgekeeper · 2021-02-21T17:30:40Z

@lgxbslgx This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it!

mcimadamore

This looks very good - sorry I missed it. If you reopen I will approve!

lgxbslgx · 2021-04-06T04:43:04Z

@mcimadamore Thank you for your help. I will reopen it.

lgxbslgx · 2021-04-06T05:10:35Z

I can't find the reopen button. Maybe it is my permission issue. Could anyone reopen it for me? Thanks a lot.

mlbridge · 2021-04-06T10:10:08Z

Mailing list message from Maurizio Cimadamore on compiler-dev:

Not sure - I don't see it either - CC'ing Erik

Maurizio

On 06/04/2021 06:13, Guoxiong Li wrote:

lgxbslgx · 2021-04-19T00:20:09Z

@mcimadamore Who should we ping to solve the reopen problem? I have several PRs which were closed by the robot and need to be reopen too.

mcimadamore · 2021-04-19T10:41:44Z

@edvbld Can you please help?

lgxbslgx · 2021-04-21T13:32:22Z

/open

openjdk · 2021-04-21T13:34:01Z

@lgxbslgx @HostUserDetails{id=13688759, username='lgxbslgx', fullName='null'} this pull request is now open

lgxbslgx · 2021-04-21T13:40:52Z

@mcimadamore The PR could be reopen by typing /open command. We can continue the work now. I would resolve the git conflicts later.

# Conflicts: # src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java

mcimadamore

Looks good - left some comments

mcimadamore · 2021-04-21T14:06:12Z

src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacScope.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.


copyright in this (and other files need to be updated)

mcimadamore · 2021-04-21T14:07:14Z

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java

@@ -90,7 +91,7 @@

    final Symtab syms;
    final JavacMessages messages;
-    final Names names;
+    private Names names;


where is this change coming from?

When building the JDK, I got the following error:

jdk/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java:950: error: variable names might not have been initialized t.name != names.init && ^ 1 error

Therefore I revised the modifier of the Names names.

I see - honestly this seems like a bug in definite assignment? E.g. surely the instance field initializer for bridgeFilter must run after the final field names has been initialized? For now you might try using an anonymous inner class instead of a lambda instead, pretty sure that will take care of the issue. But this looks like a compiler bug.

Actually - doing more tests, I think javac is right. Fields with explicit initializers are initialized BEFORE other constructor statements. Which means that the error message is legitimate (e.g. the lambda is capturing a final value that is not initialized). I think reverting back to anon class would be better here.

It's not a bug, it's a dubious feature, the lambda EG discussed that at length, you can ask Brian about it.

Usually replacing

t.name != names.init

by

t.name != this.names.init

is enough.

@forax Thank you for your reply. I tested t.name != this.names.init with final Names names; just now. The error also occurred. Same as t.name != names.init.

And I think that t.name != names.init and t.name != this.names.init are equal at this situation.

mcimadamore · 2021-04-21T14:08:38Z

src/jdk.compiler/share/classes/com/sun/tools/javac/util/Filter.java

 */
+@Deprecated(forRemoval = true, since = "17")


This is not a public API - we're in a JDK internal class - if this class is no longer needed (as is the goal of this change) simply remove it :-)

lgxbslgx · 2021-04-21T15:33:35Z

More information and some similar issues:

These four issues were fixed in this patch
JDK-8057542
JDK-8057545
JDK-8057546
JDK-8057547

This issue was fixed in this patch
JDK-8057544

But their status are still NEW. It should be revised to RESOLVED or CLOSED.

@mcimadamore I want to set these issues to CLOSED or RESOLVED. What's your opinion?

mlbridge · 2021-04-22T10:00:59Z

Mailing list message from Maurizio Cimadamore on compiler-dev:

Not sure - it doesn't seem to me that the patch for JDK-8057547 converts
other stuff to use standard functional interface. Only TypeMapping is
changed - so it affects (8057544, which can be closed).

Maurizio

On 21/04/2021 16:36, Guoxiong Li wrote:

mlbridge · 2021-04-22T10:01:01Z

Mailing list message from Maurizio Cimadamore on compiler-dev:

Not sure - it doesn't seem to me that the patch for JDK-8057547 converts
other stuff to use standard functional interface. Only TypeMapping is
changed - so it affects (8057544, which can be closed).

Maurizio

On 21/04/2021 16:36, Guoxiong Li wrote:

lgxbslgx · 2021-04-22T13:38:11Z

@mcimadamore Thank you for your reply about these issues.

For JDK-8057542 FreeTypeListener, I search the words new FreeTypeListener at the PATCH. I can get 6 places which are like the following code.

-                inferenceContext.addFreeTypeListener(ts, new FreeTypeListener() {
-                    @Override
-                    public void typesInferred(InferenceContext inferenceContext) {
-                        checkAccessibleTypes(pos, env, inferenceContext, inferenceContext.asInstTypes(ts));
-                    }
-                });
+                inferenceContext.addFreeTypeListener(ts,
+                        solvedContext -> checkAccessibleTypes(pos, env, solvedContext, solvedContext.asInstTypes(ts)));

For JDK-8057545 Factory, I search the words new Context.Factory at the PATCH. I can get 14 places which are like the following code.

-        context.put(JavaFileManager.class, new Context.Factory<JavaFileManager>() {
-            @Override
-            public JavaFileManager make(Context c) {
-                return new JavacFileManager(c, true, null);
-            }
-        });
+        context.put(JavaFileManager.class,
+                (Factory<JavaFileManager>)c -> new JavacFileManager(c, true, null));

For JDK-8057546 LintLogger, I search the words new DeferredLintHandler.LintLogger at the PATCH. I can get 4 places which are like the following code.

-            deferredLintHandler.report(new DeferredLintHandler.LintLogger() {
-                @Override
-                public void report() {
-                    warnDeprecated(pos, s);
-                }
-            });
+            deferredLintHandler.report(() -> warnDeprecated(pos, s));

For JDK-8057547 TreeBuilder, I search the words new TreeBuilder at the PATCH. I can get 7 places which are like the following code.

-            return abstractRval(s.selected, new TreeBuilder() {
-                    public JCExpression build(final JCExpression selected) {
-                        return builder.build(make.Select(selected, s.sym));
-                    }
-                });
+            return abstractRval(s.selected, selected -> builder.build(make.Select(selected, s.sym)));

On the other hand, I search new FreeTypeListener, new Context.Factory, new DeferredLintHandler.LintLogger and new TreeBuilder at current JDK main line code base. I can't get any result. So I think these four issues are solved by this PATCH or other patches.

mcimadamore · 2021-04-22T13:45:36Z

I agree that all these issues have been fixed - sorry - I thought these issues wanted to replace the various interfaces with interfaces from j.u.function (as done in this patch) - but these were about using lambda expressions more where possible - yeah I fixed that long ago.

lgxbslgx · 2021-04-22T14:53:44Z

@mcimadamore OK, I closed them just now.

mcimadamore

Looks good!

openjdk · 2021-04-22T16:07:47Z

@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:

8057543: Replace javac's Filter with Predicate (and lambdas)

Reviewed-by: mcimadamore

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 24 new commits pushed to the master branch:

33a86b9: 8263621: Convert jdk.compiler to use Stream.toList()
7df0c10: 8265480: add basic JVMCI support for JEP 309: Dynamic Class-File Constants
9499175: 8261090: Store old classfiles in static CDS archive
159f5e1: 8263636: Add --disable-registry option to jhsdb debugd
6d49cc3: 8265453: SafepointMechanism::should_process() should receive JavaThread*
fa82d47: 8264514: HexFormat implementation tweaks
e16d568: 8265218: trace_method_handle_stub fails to find calling frame on x86
86bd44f: 8257831: Suspend with handshakes
28af31d: 8263668: Update java.time to use instanceof pattern variable
a93d911: 8265607: Avoid decrementing when no Symbol was created in ~SignatureStream
... and 14 more: https://git.openjdk.java.net/jdk/compare/da860290c2657c0fb1de8c77c8dffdb35f1cf938...master

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 (@mcimadamore) 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-04-22T16:14:33Z

@mcimadamore Thank you for your review. Could I get your help to sponsor this patch?
Although the Pre-submit tests don't finish, the tests on tools/javac passed locally.

/integrate

openjdk · 2021-04-22T16:15:35Z

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

mcimadamore · 2021-04-22T16:43:14Z

/sponsor

openjdk · 2021-04-22T16:44:55Z

@mcimadamore @lgxbslgx Since your change was applied there have been 25 commits pushed to the master branch:

8758b55: 8265591: Remove vestiages of intermediate JSR 175 annotation format
33a86b9: 8263621: Convert jdk.compiler to use Stream.toList()
7df0c10: 8265480: add basic JVMCI support for JEP 309: Dynamic Class-File Constants
9499175: 8261090: Store old classfiles in static CDS archive
159f5e1: 8263636: Add --disable-registry option to jhsdb debugd
6d49cc3: 8265453: SafepointMechanism::should_process() should receive JavaThread*
fa82d47: 8264514: HexFormat implementation tweaks
e16d568: 8265218: trace_method_handle_stub fails to find calling frame on x86
86bd44f: 8257831: Suspend with handshakes
28af31d: 8263668: Update java.time to use instanceof pattern variable
... and 15 more: https://git.openjdk.java.net/jdk/compare/da860290c2657c0fb1de8c77c8dffdb35f1cf938...master

Your commit was automatically rebased without conflicts.

Pushed as commit 657f103.

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

lgxbslgx added 2 commits December 27, 2020 22:36

8057543: Replace javac's Filter with Predicate (and lambdas)

a17ee58

Add comments.

bff9cec

openjdk bot added the rfr Pull request is ready for review label Dec 27, 2020

openjdk bot added compiler compiler-dev@openjdk.org kulla kulla-dev@openjdk.org labels Dec 27, 2020

openjdk bot removed the kulla kulla-dev@openjdk.org label Dec 27, 2020

bridgekeeper bot closed this Feb 21, 2021

mcimadamore reviewed Mar 5, 2021

View reviewed changes

openjdk bot reopened this Apr 21, 2021

lgxbslgx added 2 commits April 21, 2021 21:56

Merge branch 'master' into JDK-8057543

3ce77da

# Conflicts: # src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java

Update copyright

c41335b

mcimadamore reviewed Apr 21, 2021

View reviewed changes

Remove file Filter.java

6ee2c89

Revert variabl names to modifier final

6670a2e

mcimadamore approved these changes Apr 22, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 22, 2021

openjdk bot added the sponsor Pull request is ready to be sponsored label Apr 22, 2021

openjdk bot closed this Apr 22, 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 Apr 22, 2021

lgxbslgx deleted the JDK-8057543 branch April 22, 2021 17:11

8057543: Replace javac's Filter with Predicate (and lambdas) #1898

8057543: Replace javac's Filter with Predicate (and lambdas) #1898

Conversation

lgxbslgx commented Dec 27, 2020 • edited by openjdk bot

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Dec 27, 2020

openjdk bot commented Dec 27, 2020

lgxbslgx commented Dec 27, 2020

openjdk bot commented Dec 27, 2020

mlbridge bot commented Dec 27, 2020 • edited

Webrevs

lgxbslgx commented Dec 27, 2020 • edited

bridgekeeper bot commented Jan 24, 2021

bridgekeeper bot commented Feb 21, 2021

mcimadamore left a comment

Choose a reason for hiding this comment

lgxbslgx commented Apr 6, 2021

lgxbslgx commented Apr 6, 2021

mlbridge bot commented Apr 6, 2021

lgxbslgx commented Apr 19, 2021

mcimadamore commented Apr 19, 2021

lgxbslgx commented Apr 21, 2021

openjdk bot commented Apr 21, 2021

lgxbslgx commented Apr 21, 2021

mcimadamore left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lgxbslgx commented Apr 21, 2021

mlbridge bot commented Apr 22, 2021

mlbridge bot commented Apr 22, 2021

lgxbslgx commented Apr 22, 2021

mcimadamore commented Apr 22, 2021

lgxbslgx commented Apr 22, 2021

mcimadamore left a comment

Choose a reason for hiding this comment

openjdk bot commented Apr 22, 2021 • edited

lgxbslgx commented Apr 22, 2021

openjdk bot commented Apr 22, 2021

mcimadamore commented Apr 22, 2021

openjdk bot commented Apr 22, 2021

lgxbslgx commented Dec 27, 2020 •

edited by openjdk bot

mlbridge bot commented Dec 27, 2020 •

edited

lgxbslgx commented Dec 27, 2020 •

edited

openjdk bot commented Apr 22, 2021 •

edited