From lkuskov at openjdk.java.net Thu Jan 14 23:49:16 2021 From: lkuskov at openjdk.java.net (Leonid Kuskov) Date: Thu, 14 Jan 2021 23:49:16 GMT Subject: RFR: 7902795: Provide a "release" file for AsmTools builds Message-ID: This is the fix for https://bugs.openjdk.java.net/browse/CODETOOLS-7902795 The fix provides a generation of a "release" file in the product image. The release file contains the following: SOURCE="git:f00d0a27fa21e834dc2543292a2d55215bcbf426" VERSION="7.0_10" VERSION_DATE="January 14, 2021" MILESTONE="ea" ------------- Commit messages: - 7902795: Provide a release file for AsmTools builds - Merge remote-tracking branch 'upstream/master' - 7902800: jasm incorrectly calculates ldc index in certain cases - 7902688: Asmtools support for JEP 360: changing the name from SealedTypes to SealedClasses - 7902686: Jasm incorrectly sets up the SourceFile attribute on Windows platform - 7902681: Asmtools build fails if Default Java File Encoding is set to ASCII - Merge branch 'CODETOOLS-7902659' - 7902659: Correct unconditional call of System.exit in printVersion (Main.java) - Merge branch 'CODETOOLS-7902660' - 7902660: jdis includes unnecessary Field references in MethodHandle parameters while printing static params of a bsm and skips the method tag in ldc# instructions Changes: https://git.openjdk.java.net/asmtools/pull/14/files Webrev: https://webrevs.openjdk.java.net/?repo=asmtools&pr=14&range=00 Issue: https://bugs.openjdk.java.net/browse/CODETOOLS-7902795 Stats: 47 lines in 2 files changed: 26 ins; 10 del; 11 mod Patch: https://git.openjdk.java.net/asmtools/pull/14.diff Fetch: git fetch https://git.openjdk.java.net/asmtools pull/14/head:pull/14 PR: https://git.openjdk.java.net/asmtools/pull/14 From lkuskov at openjdk.java.net Fri Jan 15 00:12:06 2021 From: lkuskov at openjdk.java.net (Leonid Kuskov) Date: Fri, 15 Jan 2021 00:12:06 GMT Subject: Integrated: 7902795: Provide a "release" file for AsmTools builds In-Reply-To: References: Message-ID: On Thu, 14 Jan 2021 23:45:53 GMT, Leonid Kuskov wrote: > This is the fix for https://bugs.openjdk.java.net/browse/CODETOOLS-7902795 > The fix provides a generation of a "release" file in the product image. > The release file contains the following: > SOURCE="git:f00d0a27fa21e834dc2543292a2d55215bcbf426" > VERSION="7.0_10" > VERSION_DATE="January 14, 2021" > MILESTONE="ea" This pull request has now been integrated. Changeset: 32667572 Author: Leonid Kuskov URL: https://git.openjdk.java.net/asmtools/commit/32667572 Stats: 47 lines in 2 files changed: 26 ins; 10 del; 11 mod 7902795: Provide a "release" file for AsmTools builds ------------- PR: https://git.openjdk.java.net/asmtools/pull/14 From jvanek at openjdk.java.net Fri Jan 15 12:09:17 2021 From: jvanek at openjdk.java.net (=?UTF-8?B?SmnFmcOt?= =?UTF-8?B?IA==?= =?UTF-8?B?VmFuxJtr?=) Date: Fri, 15 Jan 2021 12:09:17 GMT Subject: RFR: Added missing flushes Message-ID: If the asmtools are used as library, and not just a cmdline tool, then it become visible, that stdouts are not properly closed. This pr is adding flusehs jdis and jdec. Maybe the issue is more spread, but I was not using other parts library (yet) ------------- Commit messages: - Fixed missing flush for jdec - Fixed missing flush for jdis Changes: https://git.openjdk.java.net/asmtools/pull/16/files Webrev: https://webrevs.openjdk.java.net/?repo=asmtools&pr=16&range=00 Stats: 2 lines in 2 files changed: 2 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/asmtools/pull/16.diff Fetch: git fetch https://git.openjdk.java.net/asmtools pull/16/head:pull/16 PR: https://git.openjdk.java.net/asmtools/pull/16 From leonid.kuskov at oracle.com Fri Jan 15 22:04:23 2021 From: leonid.kuskov at oracle.com (Leonid Kuskov) Date: Fri, 15 Jan 2021 22:04:23 GMT Subject: git: openjdk/asmtools: 2 new changesets Message-ID: Changeset: 529b9000 Author: Jiri Committer: Leonid Kuskov Date: 2020-12-31 23:10:51 +0000 URL: https://git.openjdk.java.net/asmtools/commit/529b9000 Fixed missing flush for jdis jdis was which missing flush to supper outstrem, which was causing buffer not to be written for short files, or missing end for long ones, when different outstream then stdout was used ! src/org/openjdk/asmtools/jdis/Main.java Changeset: 678f3beb Author: Jiri Vanek Committer: Leonid Kuskov Date: 2021-01-04 13:59:36 +0000 URL: https://git.openjdk.java.net/asmtools/commit/678f3beb Fixed missing flush for jdec Jdec was which missing flush to supper outstrem, which was causing buffer not to be written for short files, or missing end for long ones, when different outstream then stdout was used ! src/org/openjdk/asmtools/jdec/Main.java From jvanek at openjdk.java.net Fri Jan 15 23:09:18 2021 From: jvanek at openjdk.java.net (=?UTF-8?B?SmnFmcOt?= =?UTF-8?B?IA==?= =?UTF-8?B?VmFuxJtr?=) Date: Fri, 15 Jan 2021 23:09:18 GMT Subject: Withdrawn: Added missing flushes In-Reply-To: References: Message-ID: On Fri, 15 Jan 2021 12:04:49 GMT, Ji?? Van?k wrote: > If the asmtools are used as library, and not just a cmdline tool, then it become visible, that stdouts are not properly closed. > This pr is adding flusehs jdis and jdec. Maybe the issue is more spread, but I was not using other parts library (yet) This pull request has been closed without being integrated. ------------- PR: https://git.openjdk.java.net/asmtools/pull/16 From jvanek at openjdk.java.net Wed Jan 20 18:34:56 2021 From: jvanek at openjdk.java.net (=?UTF-8?B?SmnFmcOt?= =?UTF-8?B?IA==?= =?UTF-8?B?VmFuxJtr?=) Date: Wed, 20 Jan 2021 18:34:56 GMT Subject: RFR: Created maven binding to make easy maven integration Message-ID: Simplest maven wrapper without any duplicated code (with hardcoded version) to allow simple asmtools usage via maven depndencies. The namespace (org.openjdk) is same as for JMH ------------- Commit messages: - Created maven binding to make easy maven integration Changes: https://git.openjdk.java.net/asmtools/pull/15/files Webrev: https://webrevs.openjdk.java.net/?repo=asmtools&pr=15&range=00 Stats: 121 lines in 3 files changed: 121 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/asmtools/pull/15.diff Fetch: git fetch https://git.openjdk.java.net/asmtools pull/15/head:pull/15 PR: https://git.openjdk.java.net/asmtools/pull/15 From jvanek at openjdk.java.net Wed Jan 20 18:34:57 2021 From: jvanek at openjdk.java.net (=?UTF-8?B?SmnFmcOt?= =?UTF-8?B?IA==?= =?UTF-8?B?VmFuxJtr?=) Date: Wed, 20 Jan 2021 18:34:57 GMT Subject: RFR: Created maven binding to make easy maven integration In-Reply-To: References: Message-ID: On Fri, 15 Jan 2021 12:02:08 GMT, Ji?? Van?k wrote: > Simplest maven wrapper without any duplicated code (with hardcoded version) to allow simple asmtools usage via maven depndencies. The namespace (org.openjdk) is same as for JMH You can see, that jcheck failed with "Symbolic links are not allowed (file: maven/src/main/resources/org/openjdk/asmtools/util/productinfo.properties)". Where productinfo.properties is probably not important the test ishsowing just tip of the iceberg - the maven binding, relayes on symlinks. I'm aware it is then linux only, but that why I set "unsupported maven wrapper.." into description. If the symlinks are really no-go, then I would probably repalce the pom.xml by shell script, screting symlinks and pom on the fly. That can be later extended with batch file, which will copy the files instead of linking. Small advantage is, that in this case I can read the version from build/productinfo.properties What is your preference? ------------- PR: https://git.openjdk.java.net/asmtools/pull/15 From lkuskov at openjdk.java.net Wed Jan 20 18:34:57 2021 From: lkuskov at openjdk.java.net (Leonid Kuskov) Date: Wed, 20 Jan 2021 18:34:57 GMT Subject: RFR: Created maven binding to make easy maven integration In-Reply-To: References: Message-ID: <3VJAblJA9-DXqn4YQan6bSU6q12hPijZo6YYKU0IRXA=.14528540-d806-46d1-b849-2f9baf3a5777@github.com> On Fri, 15 Jan 2021 12:02:21 GMT, Ji?? Van?k wrote: >> Simplest maven wrapper without any duplicated code (with hardcoded version) to allow simple asmtools usage via maven depndencies. The namespace (org.openjdk) is same as for JMH > > You can see, that jcheck failed with "Symbolic links are not allowed (file: maven/src/main/resources/org/openjdk/asmtools/util/productinfo.properties)". Where productinfo.properties is probably not important the test ishsowing just tip of the iceberg - the maven binding, relayes on symlinks. > I'm aware it is then linux only, but that why I set "unsupported maven wrapper.." into description. > If the symlinks are really no-go, then I would probably repalce the pom.xml by shell script, screting symlinks and pom on the fly. That can be later extended with batch file, which will copy the files instead of linking. > Small advantage is, that in this case I can read the version from build/productinfo.properties > What is your preference? Since this project belongs to openjdk we have to follow its rules. Thus it would be good to resolve conflict in the proper way that is good for openjdk and you. Actually, maven/src/.../util/productinfo.properties is just template that is added to a product image once it's written out. Please use the resource build/productinfo.properties for maven purposes. ------------- PR: https://git.openjdk.java.net/asmtools/pull/15 From jvanek at openjdk.java.net Wed Jan 20 18:34:57 2021 From: jvanek at openjdk.java.net (=?UTF-8?B?SmnFmcOt?= =?UTF-8?B?IA==?= =?UTF-8?B?VmFuxJtr?=) Date: Wed, 20 Jan 2021 18:34:57 GMT Subject: RFR: Created maven binding to make easy maven integration In-Reply-To: <3VJAblJA9-DXqn4YQan6bSU6q12hPijZo6YYKU0IRXA=.14528540-d806-46d1-b849-2f9baf3a5777@github.com> References: <3VJAblJA9-DXqn4YQan6bSU6q12hPijZo6YYKU0IRXA=.14528540-d806-46d1-b849-2f9baf3a5777@github.com> Message-ID: On Fri, 15 Jan 2021 21:54:33 GMT, Leonid Kuskov wrote: > Since this project belongs to openjdk we have to follow its rules. Thus it would be good to resolve conflict in the proper way that is good for openjdk and you. Actually, maven/src/.../util/productinfo.properties is just template that is added to a product image once it's written out. Please use the resource build/productinfo.properties for maven purposes. Oh. Good catch. For now I had switched the link to point to correct ProductInfo.java from build directory. As for the symlinks x wrapper, I do not have strong preference. I would like to add maven binding, as it will simplify integration in maven projects using jasm/jcoder as depndece really a lot, and I'm vearry happy that you are not aginst the idea. I think the symlinks are a bit better as they are very direct. If the openjdk rules forbids them, or you are uneasy with them as a master of asmtools, then I will rework the symlinks+pom.xml to pom.xml.in and mvwarpper.sh. The mvn wrapper will be then responsible to set up symlinks (on posix machines) and generate pom.xml. Final experience will be aprox same. Also the small advantage of including data from productinfo.properties to pom.xml would be there. I will be unable to provide windows wrapper, but from that point of view it is same as symlinks. Of course if you have any other suggestion, I will be happy to follow. ------------- PR: https://git.openjdk.java.net/asmtools/pull/15 From lkuskov at openjdk.java.net Wed Jan 20 18:34:57 2021 From: lkuskov at openjdk.java.net (Leonid Kuskov) Date: Wed, 20 Jan 2021 18:34:57 GMT Subject: RFR: Created maven binding to make easy maven integration In-Reply-To: References: <3VJAblJA9-DXqn4YQan6bSU6q12hPijZo6YYKU0IRXA=.14528540-d806-46d1-b849-2f9baf3a5777@github.com> Message-ID: On Sat, 16 Jan 2021 09:44:09 GMT, Ji?? Van?k wrote: >> Since this project belongs to openjdk we have to follow its rules. Thus it would be good to resolve conflict in the proper way that is good for openjdk and you. Actually, maven/src/.../util/productinfo.properties is just template that is added to a product image once it's written out. Please use the resource build/productinfo.properties for maven purposes. > >> Since this project belongs to openjdk we have to follow its rules. Thus it would be good to resolve conflict in the proper way that is good for openjdk and you. Actually, maven/src/.../util/productinfo.properties is just template that is added to a product image once it's written out. Please use the resource build/productinfo.properties for maven purposes. > > Oh. Good catch. For now I had switched the link to point to correct ProductInfo.java from build directory. > > As for the symlinks x wrapper, I do not have strong preference. I would like to add maven binding, as it will simplify integration in maven projects using jasm/jcoder as depndece really a lot, and I'm vearry happy that you are not aginst the idea. I think the symlinks are a bit better as they are very direct. If the openjdk rules forbids them, or you are uneasy with them as a master of asmtools, then I will rework the symlinks+pom.xml to pom.xml.in and mvwarpper.sh. > The mvn wrapper will be then responsible to set up symlinks (on posix machines) and generate pom.xml. Final experience will be aprox same. Also the small advantage of including data from productinfo.properties to pom.xml would be there. I will be unable to provide windows wrapper, but from that point of view it is same as symlinks. > > Of course if you have any other suggestion, I will be happy to follow. > _I will rework the symlinks+pom.xml to pom.xml.in and mvwarpper.sh. > The mvn wrapper will be then responsible to set up symlinks (on posix machines) and generate pom.xml. Final experience > will be aprox same. Also the small advantage of including data from productinfo.properties to pom.xml would be there._ Sounds good. Please integrate your changes I will be a sponsor for them ------------- PR: https://git.openjdk.java.net/asmtools/pull/15 From jvanek at openjdk.java.net Wed Jan 20 18:45:05 2021 From: jvanek at openjdk.java.net (=?UTF-8?B?SmnFmcOt?= =?UTF-8?B?IA==?= =?UTF-8?B?VmFuxJtr?=) Date: Wed, 20 Jan 2021 18:45:05 GMT Subject: RFR: Created maven binding to make easy maven integration [v2] In-Reply-To: References: Message-ID: > Simplest maven wrapper without any duplicated code (with hardcoded version) to allow simple asmtools usage via maven depndencies. The namespace (org.openjdk) is same as for JMH Ji?? Van?k has refreshed the contents of this pull request, and previous commits have been removed. The incremental views will show differences compared to the previous content of the PR. The pull request contains one new commit since the last revision: Created maven binding to make easy maven integration ------------- Changes: - all: https://git.openjdk.java.net/asmtools/pull/15/files - new: https://git.openjdk.java.net/asmtools/pull/15/files/9786a2aa..4f2f822c Webrevs: - full: https://webrevs.openjdk.java.net/?repo=asmtools&pr=15&range=01 - incr: https://webrevs.openjdk.java.net/?repo=asmtools&pr=15&range=00-01 Stats: 4 lines in 1 file changed: 3 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/asmtools/pull/15.diff Fetch: git fetch https://git.openjdk.java.net/asmtools pull/15/head:pull/15 PR: https://git.openjdk.java.net/asmtools/pull/15 From lkuskov at openjdk.java.net Thu Jan 21 00:28:44 2021 From: lkuskov at openjdk.java.net (Leonid Kuskov) Date: Thu, 21 Jan 2021 00:28:44 GMT Subject: RFR: Created maven binding to make easy maven integration [v2] In-Reply-To: References: Message-ID: On Wed, 20 Jan 2021 18:45:05 GMT, Ji?? Van?k wrote: >> Simplest maven wrapper without any duplicated code (with hardcoded version) to allow simple asmtools usage via maven depndencies. The namespace (org.openjdk) is same as for JMH > > Ji?? Van?k has refreshed the contents of this pull request, and previous commits have been removed. The incremental views will show differences compared to the previous content of the PR. Looks good ------------- Marked as reviewed by lkuskov (Committer). PR: https://git.openjdk.java.net/asmtools/pull/15 From jvanek at openjdk.java.net Thu Jan 21 11:39:03 2021 From: jvanek at openjdk.java.net (=?UTF-8?B?SmnFmcOt?= =?UTF-8?B?IA==?= =?UTF-8?B?VmFuxJtr?=) Date: Thu, 21 Jan 2021 11:39:03 GMT Subject: RFR: Created maven binding to make easy maven integration [v2] In-Reply-To: References: Message-ID: <33kIdN1mnwlJtV_EUprG8pRoa9eFYkCDGfnkp_Do9MI=.74f5b0c2-a3cd-4dfa-9d6b-4c5132eb9d50@github.com> On Thu, 21 Jan 2021 00:25:41 GMT, Leonid Kuskov wrote: >> Ji?? Van?k has refreshed the contents of this pull request, and previous commits have been removed. The incremental views will show differences compared to the previous content of the PR. > > Looks good Hi! I have removed one triplicated line to function. If it is still good, what next? Can you merge or is ball in my hands? Thanx a lot for welcoming review. ------------- PR: https://git.openjdk.java.net/asmtools/pull/15 From jvanek at openjdk.java.net Thu Jan 21 11:39:03 2021 From: jvanek at openjdk.java.net (=?UTF-8?B?SmnFmcOt?= =?UTF-8?B?IA==?= =?UTF-8?B?VmFuxJtr?=) Date: Thu, 21 Jan 2021 11:39:03 GMT Subject: RFR: Created maven binding to make easy maven integration [v3] In-Reply-To: References: Message-ID: > Simplest maven wrapper without any duplicated code (with hardcoded version) to allow simple asmtools usage via maven depndencies. The namespace (org.openjdk) is same as for JMH Ji?? Van?k has refreshed the contents of this pull request, and previous commits have been removed. The incremental views will show differences compared to the previous content of the PR. The pull request contains one new commit since the last revision: Created maven binding to make easy maven integration ------------- Changes: - all: https://git.openjdk.java.net/asmtools/pull/15/files - new: https://git.openjdk.java.net/asmtools/pull/15/files/4f2f822c..b60fa07f Webrevs: - full: https://webrevs.openjdk.java.net/?repo=asmtools&pr=15&range=02 - incr: https://webrevs.openjdk.java.net/?repo=asmtools&pr=15&range=01-02 Stats: 9 lines in 1 file changed: 4 ins; 0 del; 5 mod Patch: https://git.openjdk.java.net/asmtools/pull/15.diff Fetch: git fetch https://git.openjdk.java.net/asmtools pull/15/head:pull/15 PR: https://git.openjdk.java.net/asmtools/pull/15 From lkuskov at openjdk.java.net Thu Jan 21 23:03:03 2021 From: lkuskov at openjdk.java.net (Leonid Kuskov) Date: Thu, 21 Jan 2021 23:03:03 GMT Subject: RFR: Created maven binding to make easy maven integration [v3] In-Reply-To: References: Message-ID: <59e5okXD9xP2Y37RDUe45AlfXrxPJUdFeJmKII-9etE=.baa80c4e-102b-4c9d-b11b-730ab888a474@github.com> On Thu, 21 Jan 2021 11:39:03 GMT, Ji?? Van?k wrote: >> Simplest maven wrapper without any duplicated code (with hardcoded version) to allow simple asmtools usage via maven depndencies. The namespace (org.openjdk) is same as for JMH > > Ji?? Van?k has refreshed the contents of this pull request, and previous commits have been removed. The incremental views will show differences compared to the previous content of the PR. Marked as reviewed by lkuskov (Committer). ------------- PR: https://git.openjdk.java.net/asmtools/pull/15 From lkuskov at openjdk.java.net Thu Jan 21 23:03:04 2021 From: lkuskov at openjdk.java.net (Leonid Kuskov) Date: Thu, 21 Jan 2021 23:03:04 GMT Subject: RFR: Created maven binding to make easy maven integration [v2] In-Reply-To: <33kIdN1mnwlJtV_EUprG8pRoa9eFYkCDGfnkp_Do9MI=.74f5b0c2-a3cd-4dfa-9d6b-4c5132eb9d50@github.com> References: <33kIdN1mnwlJtV_EUprG8pRoa9eFYkCDGfnkp_Do9MI=.74f5b0c2-a3cd-4dfa-9d6b-4c5132eb9d50@github.com> Message-ID: <_M-n_gTC0LWOhoA78TWtoDKSX6vqX1Yc6ikVWsk54fk=.98d4deed-1ca2-42ed-abf2-877342831594@github.com> On Thu, 21 Jan 2021 11:33:13 GMT, Ji?? Van?k wrote: >> Looks good > > Hi! I have removed one triplicated line to function. > If it is still good, what next? Can you merge or is ball in my hands? > Thanx a lot for welcoming review. Hi, Your fixes are good for the integration. Since you are a contributor please just type "/ integrate" in a new comment. Thanks for the fixes. ------------- PR: https://git.openjdk.java.net/asmtools/pull/15 From jvanek at openjdk.java.net Fri Jan 22 07:50:34 2021 From: jvanek at openjdk.java.net (=?UTF-8?B?SmnFmcOt?= =?UTF-8?B?IA==?= =?UTF-8?B?VmFuxJtr?=) Date: Fri, 22 Jan 2021 07:50:34 GMT Subject: RFR: Created maven binding to make easy maven integration [v3] In-Reply-To: <59e5okXD9xP2Y37RDUe45AlfXrxPJUdFeJmKII-9etE=.baa80c4e-102b-4c9d-b11b-730ab888a474@github.com> References: <59e5okXD9xP2Y37RDUe45AlfXrxPJUdFeJmKII-9etE=.baa80c4e-102b-4c9d-b11b-730ab888a474@github.com> Message-ID: <-maeNtHQl3Ygf3zAF-OxDm6AjApolcqrR7T8OI9g8ek=.cbcc5dfe-8578-4a23-931c-b8564b800f57@github.com> On Thu, 21 Jan 2021 23:00:54 GMT, Leonid Kuskov wrote: >> Ji?? Van?k has refreshed the contents of this pull request, and previous commits have been removed. The incremental views will show differences compared to the previous content of the PR. > > Marked as reviewed by lkuskov (Committer). thanx a lot. I keep forgetting about "/ integrate". done ------------- PR: https://git.openjdk.java.net/asmtools/pull/15 From jvanek at openjdk.java.net Fri Jan 22 17:16:49 2021 From: jvanek at openjdk.java.net (=?UTF-8?B?SmnFmcOt?= =?UTF-8?B?IA==?= =?UTF-8?B?VmFuxJtr?=) Date: Fri, 22 Jan 2021 17:16:49 GMT Subject: Integrated: Created maven binding to make easy maven integration In-Reply-To: References: Message-ID: On Fri, 15 Jan 2021 12:02:08 GMT, Ji?? Van?k wrote: > Simplest maven wrapper without any duplicated code (with hardcoded version) to allow simple asmtools usage via maven depndencies. The namespace (org.openjdk) is same as for JMH This pull request has now been integrated. Changeset: 7eadbbf8 Author: Ji?? Van?k Committer: Leonid Kuskov URL: https://git.openjdk.java.net/asmtools/commit/7eadbbf8 Stats: 128 lines in 3 files changed: 128 ins; 0 del; 0 mod Created maven binding to make easy maven integration Reviewed-by: lkuskov ------------- PR: https://git.openjdk.java.net/asmtools/pull/15