Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6996: Properly support converters #168

Closed

Conversation

thegreystone
Copy link
Member

@thegreystone thegreystone commented Nov 25, 2020

Including simple test to verify that the resulting instrumented methods are ok.


Progress

  • Commit message must refer to an issue
  • Change must be properly reviewed

Testing

linux mac win
Build / test ✔️ (1/1 passed) ✔️ (1/1 passed) ✔️ (1/1 passed)

Issue

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jmc pull/168/head:pull/168
$ git checkout pull/168

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 25, 2020

👋 Welcome back hirt! 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 openjdk bot added the rfr label Nov 25, 2020
@mlbridge
Copy link

mlbridge bot commented Nov 25, 2020

@thegreystone
Copy link
Member Author

I'll need to do more validation and have better handling of bad configurations, but will handle that in a bug after this enhancement is in.

Copy link
Contributor

@gunnarmorling gunnarmorling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few comments/suggestions inline. Some surely based on my lack of familiarity with the code base, so bear with me ;)

@@ -1,9 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that this will be changed back by @Josh-Matsuoka once the JDK 8 fixes are in. :)

Copy link
Contributor

@gunnarmorling gunnarmorling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some more small comments.

Copy link
Contributor

@guruhb guruhb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update README.md

@openjdk
Copy link

openjdk bot commented Nov 30, 2020

@thegreystone this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout agentdefaultconverters
git fetch https://git.openjdk.java.net/jmc master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Dec 1, 2020

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

6996: Properly support converters

Reviewed-by: ghb

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added ready and removed merge-conflict labels Dec 1, 2020
@thegreystone thegreystone removed the request for review from Gunde December 1, 2020 07:21
@thegreystone
Copy link
Member Author

/integrate

@openjdk openjdk bot closed this Dec 1, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Dec 1, 2020
@openjdk
Copy link

openjdk bot commented Dec 1, 2020

@thegreystone Pushed as commit abfabc3.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

3 participants