RFR: 8066694: Strange code in JavacParser.java

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

RFR: 8066694: Strange code in JavacParser.java

Andrey Turbanov-2
This code was introduced in main repository under https://bugs.openjdk.java.net/browse/JDK-8006775
I checked original commit in `type-annotations/langtools` repository: https://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/71f35e4b93a5
Looks like it's not a merge problem.

-------------

Commit messages:
 - 8066694: Strange code in JavacParser.java

Changes: https://git.openjdk.java.net/jdk/pull/1852/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk&pr=1852&range=00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8066694
  Stats: 7 lines in 1 file changed: 0 ins; 4 del; 3 mod
  Patch: https://git.openjdk.java.net/jdk/pull/1852.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk pull/1852/head:pull/1852

PR: https://git.openjdk.java.net/jdk/pull/1852
Reply | Threaded
Open this post in threaded view
|

Re: RFR: 8066694: Strange code in JavacParser.java

Jonathan Gibbons-2
On Sun, 20 Dec 2020 13:13:43 GMT, Andrey Turbanov <[hidden email]> wrote:

> This code was introduced in main repository under https://bugs.openjdk.java.net/browse/JDK-8006775
> I checked original commit in `type-annotations/langtools` repository: https://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/71f35e4b93a5
> Looks like it's not a merge problem.

I suspect this was originally a merge issue, in the work leading up to the integration of the JSR308 work.

src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java line 2397:

> 2395:                     elemtype = bracketsOptCont(elemtype, pos, maybeDimAnnos);
> 2396:                 } else {
> 2397:                     if (token.kind == RBRACKET) { // no dimension

I suggest keeping the comment, by moving it to line 2394

-------------

Changes requested by jjg (Reviewer).

PR: https://git.openjdk.java.net/jdk/pull/1852
Reply | Threaded
Open this post in threaded view
|

Re: RFR: 8066694: Strange code in JavacParser.java [v2]

Andrey Turbanov-2
In reply to this post by Andrey Turbanov-2
> This code was introduced in main repository under https://bugs.openjdk.java.net/browse/JDK-8006775
> I checked original commit in `type-annotations/langtools` repository: https://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/71f35e4b93a5
> Looks like it's not a merge problem.

Andrey Turbanov has updated the pull request incrementally with one additional commit since the last revision:

  8066694: Strange code in JavacParser.java

-------------

Changes:
  - all: https://git.openjdk.java.net/jdk/pull/1852/files
  - new: https://git.openjdk.java.net/jdk/pull/1852/files/a76a30c1..e903d437

Webrevs:
 - full: https://webrevs.openjdk.java.net/?repo=jdk&pr=1852&range=01
 - incr: https://webrevs.openjdk.java.net/?repo=jdk&pr=1852&range=00-01

  Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod
  Patch: https://git.openjdk.java.net/jdk/pull/1852.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk pull/1852/head:pull/1852

PR: https://git.openjdk.java.net/jdk/pull/1852
Reply | Threaded
Open this post in threaded view
|

Re: RFR: 8066694: Strange code in JavacParser.java [v2]

Andrey Turbanov-2
In reply to this post by Jonathan Gibbons-2
On Mon, 21 Dec 2020 17:13:05 GMT, Jonathan Gibbons <[hidden email]> wrote:

> I suspect this was originally a merge issue, in the work leading up to the integration of the JSR308 work.

Do you know is history of original changes available somewhere?

-------------

PR: https://git.openjdk.java.net/jdk/pull/1852
Reply | Threaded
Open this post in threaded view
|

Re: RFR: 8066694: Strange code in JavacParser.java [v2]

Jonathan Gibbons

On 12/22/20 10:52 AM, Andrey Turbanov wrote:
> On Mon, 21 Dec 2020 17:13:05 GMT, Jonathan Gibbons <[hidden email]> wrote:
>
>> I suspect this was originally a merge issue, in the work leading up to the integration of the JSR308 work.
> Do you know is history of original changes available somewhere?
>
> -------------
>
> PR: https://git.openjdk.java.net/jdk/pull/1852


It may be available somewhere, but I don't see a need to go there. The
fix looks simple enough on the merits.

-- Jon

Reply | Threaded
Open this post in threaded view
|

Withdrawn: 8066694: Strange code in JavacParser.java

duke
In reply to this post by Andrey Turbanov-2
On Sun, 20 Dec 2020 13:13:43 GMT, Andrey Turbanov <[hidden email]> wrote:

> This code was introduced in main repository under https://bugs.openjdk.java.net/browse/JDK-8006775
> I checked original commit in `type-annotations/langtools` repository: https://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/71f35e4b93a5
> Looks like it's not a merge problem.

This pull request has been closed without being integrated.

-------------

PR: https://git.openjdk.java.net/jdk/pull/1852