From lkuskov at openjdk.java.net Wed Apr 7 18:34:50 2021 From: lkuskov at openjdk.java.net (Leonid Kuskov) Date: Wed, 7 Apr 2021 18:34:50 GMT Subject: RFR: 7902876: Cleanup Instr tool Message-ID: This is the fix for https://bugs.openjdk.java.net/browse/CODETOOLS-7902876 The update fixes the following 1. usage of methods in utests should be downgraded to JDK 8 2. spelling errors and malformed comments 3. javap regression 4. jcov should be switched from 9.0.1 snapshot to 9.1 (JDK 17 is supported) 5. deprecated methods should be refactored ------------- Commit messages: - 7902876: Cleanup Instr tool - Instrumentation plugin concept - 7902764: RepGen: Javap mode doesn't support classes that have no package - 7902724: jcov ignores covariant method overriding while gathering a methods coverages - Merge remote-tracking branch 'upstream/master' - 7902819: jcov fails to instrument JDKs records - Merge branch 'master' into CODETOOLS-7902823 - 7902823: RepGen fails with IllegalFormatArgumentIndexException if started by JDK 16 and above - Merge remote-tracking branch 'upstream/master' - 7902796: Provide a "release" file for JCov builds - ... and 8 more: https://git.openjdk.java.net/jcov/compare/19a1a119...aba9f91b Changes: https://git.openjdk.java.net/jcov/pull/12/files Webrev: https://webrevs.openjdk.java.net/?repo=jcov&pr=12&range=00 Issue: https://bugs.openjdk.java.net/browse/CODETOOLS-7902876 Stats: 1283 lines in 26 files changed: 926 ins; 94 del; 263 mod Patch: https://git.openjdk.java.net/jcov/pull/12.diff Fetch: git fetch https://git.openjdk.java.net/jcov pull/12/head:pull/12 PR: https://git.openjdk.java.net/jcov/pull/12 From lkuskov at openjdk.java.net Wed Apr 7 18:41:45 2021 From: lkuskov at openjdk.java.net (Leonid Kuskov) Date: Wed, 7 Apr 2021 18:41:45 GMT Subject: RFR: 7902876: Cleanup Instr tool [v2] In-Reply-To: References: Message-ID: <2eCyd4r63vWvSQZj_aMeOvixnuj0hPACxaDjYRCRVsk=.17dc383f-7592-4a21-9bdb-471dc2361dd6@github.com> > This is the fix for https://bugs.openjdk.java.net/browse/CODETOOLS-7902876 > The update fixes the following > 1. usage of methods in utests should be downgraded to JDK 8 > 2. spelling errors and malformed comments > 3. javap regression > 4. jcov should be switched from 9.0.1 snapshot to 9.1 (JDK 17 is supported) > 5. deprecated methods should be refactored Leonid Kuskov has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 19 commits: - Merge branch 'master' into CODETOOLS-7902876 - 7902876: Cleanup Instr tool - Instrumentation plugin concept Reviewed-by: lkuskov - 7902764: RepGen: Javap mode doesn't support classes that have no package - 7902724: jcov ignores covariant method overriding while gathering a methods coverages - Merge remote-tracking branch 'upstream/master' - 7902819: jcov fails to instrument JDKs records - Merge branch 'master' into CODETOOLS-7902823 - 7902823: RepGen fails with IllegalFormatArgumentIndexException if started by JDK 16 and above - Merge remote-tracking branch 'upstream/master' - ... and 9 more: https://git.openjdk.java.net/jcov/compare/8deab262...a7ee41e7 ------------- Changes: https://git.openjdk.java.net/jcov/pull/12/files Webrev: https://webrevs.openjdk.java.net/?repo=jcov&pr=12&range=01 Stats: 339 lines in 12 files changed: 137 ins; 62 del; 140 mod Patch: https://git.openjdk.java.net/jcov/pull/12.diff Fetch: git fetch https://git.openjdk.java.net/jcov pull/12/head:pull/12 PR: https://git.openjdk.java.net/jcov/pull/12 From shurailine at openjdk.java.net Wed Apr 7 19:13:16 2021 From: shurailine at openjdk.java.net (Alexandre Iline) Date: Wed, 7 Apr 2021 19:13:16 GMT Subject: RFR: 7902876: Cleanup Instr tool [v2] In-Reply-To: <2eCyd4r63vWvSQZj_aMeOvixnuj0hPACxaDjYRCRVsk=.17dc383f-7592-4a21-9bdb-471dc2361dd6@github.com> References: <2eCyd4r63vWvSQZj_aMeOvixnuj0hPACxaDjYRCRVsk=.17dc383f-7592-4a21-9bdb-471dc2361dd6@github.com> Message-ID: On Wed, 7 Apr 2021 18:41:45 GMT, Leonid Kuskov wrote: >> This is the fix for https://bugs.openjdk.java.net/browse/CODETOOLS-7902876 >> The update fixes the following >> 1. usage of methods in utests should be downgraded to JDK 8 >> 2. spelling errors and malformed comments >> 3. javap regression >> 4. jcov should be switched from 9.0.1 snapshot to 9.1 (JDK 17 is supported) >> 5. deprecated methods should be refactored > > Leonid Kuskov has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 19 commits: > > - Merge branch 'master' into CODETOOLS-7902876 > - 7902876: Cleanup Instr tool > - Instrumentation plugin concept > > Reviewed-by: lkuskov > - 7902764: RepGen: Javap mode doesn't support classes that have no package > - 7902724: jcov ignores covariant method overriding while gathering a methods coverages > - Merge remote-tracking branch 'upstream/master' > - 7902819: jcov fails to instrument JDKs records > - Merge branch 'master' into CODETOOLS-7902823 > - 7902823: RepGen fails with IllegalFormatArgumentIndexException if started by JDK 16 and above > - Merge remote-tracking branch 'upstream/master' > - ... and 9 more: https://git.openjdk.java.net/jcov/compare/8deab262...a7ee41e7 LGTM ------------- PR: https://git.openjdk.java.net/jcov/pull/12 From duke at openjdk.java.net Wed Apr 7 19:24:07 2021 From: duke at openjdk.java.net (duke) Date: Wed, 7 Apr 2021 19:24:07 GMT Subject: git: openjdk/jcov: 7902876: Cleanup Instr tool (#12) Message-ID: <721bdf13-b43c-4416-892e-3494600555a6@openjdk.java.net> Changeset: e847caf0 Author: Leonid Kuskov Committer: GitHub Date: 2021-04-07 12:23:48 +0000 URL: https://git.openjdk.java.net/jcov/commit/e847caf0 7902876: Cleanup Instr tool (#12) * 7902535: Code coverage does not work in JDK 8 * 7902697: Switch jcov to the latest asm lib to support latest classfile * 7902642: Make JCov runtime to only depend on java.base * 7902724: jcov ignores covariant method overriding while gathering a methods' coverages * 7902783: Static instrumentation fails with Java 9 and above if multiple inputs are used * 7902796: Provide a "release" file for JCov builds * 7902823: RepGen fails with IllegalFormatArgumentIndexException if started by JDK 16 and above * 7902819: jcov fails to instrument JDKs records * 7902724: jcov ignores covariant method overriding while gathering a methods coverages * 7902764: RepGen: Javap mode doesn't support classes that have no package * Instrumentation plugin concept Reviewed-by: lkuskov * 7902876: Cleanup Instr tool Co-authored-by: Alexandre Iline ! build/build.properties ! build/release.properties ! src/classes/com/sun/tdk/jcov/Instr.java ! src/classes/com/sun/tdk/jcov/insert/AbstractUniversalInstrumenter.java ! src/classes/com/sun/tdk/jcov/instrument/InstrumentationOptions.java ! src/classes/com/sun/tdk/jcov/instrument/InstrumentationParams.java ! src/classes/com/sun/tdk/jcov/report/javap/JavapClassReader.java ! src/classes/com/sun/tdk/jcov/runtime/PropertyFinder.java ! src/classes/com/sun/tdk/jcov/tools/JCovCMDTool.java ! src/classes/com/sun/tdk/jcov/util/Utils.java ! test/unit/com/sun/tdk/jcov/instrument/plugin/FieldsTest.java ! test/unit/com/sun/tdk/jcov/lib/InstrProxy.java From lkuskov at openjdk.java.net Wed Apr 7 19:28:16 2021 From: lkuskov at openjdk.java.net (Leonid Kuskov) Date: Wed, 7 Apr 2021 19:28:16 GMT Subject: Withdrawn: 7902876: Cleanup Instr tool In-Reply-To: References: Message-ID: On Wed, 7 Apr 2021 18:29:07 GMT, Leonid Kuskov wrote: > This is the fix for https://bugs.openjdk.java.net/browse/CODETOOLS-7902876 > The update fixes the following > 1. usage of methods in utests should be downgraded to JDK 8 > 2. spelling errors and malformed comments > 3. javap regression > 4. jcov should be switched from 9.0.1 snapshot to 9.1 (JDK 17 is supported) > 5. deprecated methods should be refactored This pull request has been closed without being integrated. ------------- PR: https://git.openjdk.java.net/jcov/pull/12 From lkuskov at openjdk.java.net Tue Apr 13 04:28:12 2021 From: lkuskov at openjdk.java.net (Leonid Kuskov) Date: Tue, 13 Apr 2021 04:28:12 GMT Subject: Integrated: Resolved merge conflict caused by CODETOOLS-7902876 Message-ID: This is the fix to remove the merge conflict caused by the CODETOOLS-7902876 integration ------------- Commit messages: - Resolved merge conflict caused by CODETOOLS-7902876 - 7902876: Cleanup Instr tool - Instrumentation plugin concept - 7902764: RepGen: Javap mode doesn't support classes that have no package - 7902724: jcov ignores covariant method overriding while gathering a methods coverages - Merge remote-tracking branch 'upstream/master' - 7902819: jcov fails to instrument JDKs records - Merge branch 'master' into CODETOOLS-7902823 - 7902823: RepGen fails with IllegalFormatArgumentIndexException if started by JDK 16 and above - Merge remote-tracking branch 'upstream/master' - ... and 9 more: https://git.openjdk.java.net/jcov/compare/e847caf0...447c42c9 Changes: https://git.openjdk.java.net/jcov/pull/13/files Webrev: https://webrevs.openjdk.java.net/?repo=jcov&pr=13&range=00 Stats: 11 lines in 4 files changed: 0 ins; 5 del; 6 mod Patch: https://git.openjdk.java.net/jcov/pull/13.diff Fetch: git fetch https://git.openjdk.java.net/jcov pull/13/head:pull/13 PR: https://git.openjdk.java.net/jcov/pull/13 From lkuskov at openjdk.java.net Tue Apr 13 04:28:13 2021 From: lkuskov at openjdk.java.net (Leonid Kuskov) Date: Tue, 13 Apr 2021 04:28:13 GMT Subject: Integrated: Resolved merge conflict caused by CODETOOLS-7902876 In-Reply-To: References: Message-ID: On Tue, 13 Apr 2021 03:59:07 GMT, Leonid Kuskov wrote: > This is the fix to remove the merge conflict caused by the CODETOOLS-7902876 integration This pull request has now been integrated. Changeset: e2440f27 Author: Leonid Kuskov URL: https://git.openjdk.java.net/jcov/commit/e2440f27 Stats: 11 lines in 4 files changed: 0 ins; 5 del; 6 mod Resolved merge conflict caused by CODETOOLS-7902876 ------------- PR: https://git.openjdk.java.net/jcov/pull/13 From lkuskov at openjdk.java.net Sat Apr 17 01:17:56 2021 From: lkuskov at openjdk.java.net (Leonid Kuskov) Date: Sat, 17 Apr 2021 01:17:56 GMT Subject: RFR: 7902878: JCov loses module hashes Message-ID: This is the fix for https://bugs.openjdk.java.net/browse/CODETOOLS-7902878 JREInstr writes empty ModuleHashes attribute into java.base/module-info that cause a failure of the check of unavailability of qualified exports to upgradeable modules. The fix removes ModuleHashes attribute from java.base/module-info which isn't needed for an instrumented JDK.(File: JREInstr.java) Also the update contains minor code cleanup found during fixing. ------------- Commit messages: - 7902878: JCov loses module hashes Changes: https://git.openjdk.java.net/jcov/pull/14/files Webrev: https://webrevs.openjdk.java.net/?repo=jcov&pr=14&range=00 Issue: https://bugs.openjdk.java.net/browse/CODETOOLS-7902878 Stats: 281 lines in 8 files changed: 60 ins; 141 del; 80 mod Patch: https://git.openjdk.java.net/jcov/pull/14.diff Fetch: git fetch https://git.openjdk.java.net/jcov pull/14/head:pull/14 PR: https://git.openjdk.java.net/jcov/pull/14 From shurailine at openjdk.java.net Mon Apr 19 20:18:09 2021 From: shurailine at openjdk.java.net (Alexandre Iline) Date: Mon, 19 Apr 2021 20:18:09 GMT Subject: RFR: 7902878: JCov loses module hashes In-Reply-To: References: Message-ID: On Sat, 17 Apr 2021 01:13:38 GMT, Leonid Kuskov wrote: > This is the fix for https://bugs.openjdk.java.net/browse/CODETOOLS-7902878 > JREInstr writes empty ModuleHashes attribute into java.base/module-info that cause > a failure of the check of unavailability of qualified exports to upgradeable modules. > The fix removes ModuleHashes attribute from java.base/module-info which isn't needed > for an instrumented JDK.(File: JREInstr.java) > Also the update contains minor code cleanup found during fixing. Marked as reviewed by shurailine (Committer). ------------- PR: https://git.openjdk.java.net/jcov/pull/14 From lkuskov at openjdk.java.net Mon Apr 19 21:06:09 2021 From: lkuskov at openjdk.java.net (Leonid Kuskov) Date: Mon, 19 Apr 2021 21:06:09 GMT Subject: Integrated: 7902878: JCov loses module hashes In-Reply-To: References: Message-ID: <1h54F7mHhEhBnl6CV7lXeCIC_TCZPwV54TZm03lIdRY=.2f287a9a-1c21-4500-b530-3806e08215d3@github.com> On Sat, 17 Apr 2021 01:13:38 GMT, Leonid Kuskov wrote: > This is the fix for https://bugs.openjdk.java.net/browse/CODETOOLS-7902878 > JREInstr writes empty ModuleHashes attribute into java.base/module-info that cause > a failure of the check of unavailability of qualified exports to upgradeable modules. > The fix removes ModuleHashes attribute from java.base/module-info which isn't needed > for an instrumented JDK.(File: JREInstr.java) > Also the update contains minor code cleanup found during fixing. This pull request has now been integrated. Changeset: 5e08fd00 Author: Leonid Kuskov URL: https://git.openjdk.java.net/jcov/commit/5e08fd00 Stats: 281 lines in 8 files changed: 60 ins; 141 del; 80 mod 7902878: JCov loses module hashes Reviewed-by: shurailine ------------- PR: https://git.openjdk.java.net/jcov/pull/14