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

Experiment with replacing textual representation in classfile with method that builds the model #274

Open
wants to merge 24 commits into
base: code-reflection
Choose a base branch
from

Conversation

mabbay
Copy link
Member

@mabbay mabbay commented Nov 8, 2024

Experiment with replacing textual representation in classfile with method that builds the model.
Note: This PR is based on changes from #272.


Progress

  • Change must not contain extraneous whitespace

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/babylon.git pull/274/head:pull/274
$ git checkout pull/274

Update a local copy of the PR:
$ git checkout pull/274
$ git pull https://git.openjdk.org/babylon.git pull/274/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 274

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/babylon/pull/274.diff

Using Webrev

Link to Webrev Comment

@mabbay mabbay self-assigned this Nov 8, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented Nov 8, 2024

👋 Welcome back mabbay! A progress list of the required criteria for merging this PR into code-reflection will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Nov 8, 2024

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

Experiment with replacing textual representation in classfile with method that builds the model

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 code-reflection 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 code-reflection branch, type /integrate in a new comment.

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 8, 2024
@mlbridge
Copy link

mlbridge bot commented Nov 8, 2024

@@ -195,6 +195,19 @@ private static <O extends Op & Op.Invokable> void generateMethod(MethodHandles.L
iop.body().blocks(), cob, lambdaSink, quotable).generate()));
}

public static byte[] addOpByteCodeToClassFile(MethodHandles.Lookup lookup, ClassModel cm, String methodName, FuncOp builderOp) {
Copy link
Member

Choose a reason for hiding this comment

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

Is this method still used?

Copy link
Member Author

Choose a reason for hiding this comment

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

No it's not used, I will remove it.

@openjdk
Copy link

openjdk bot commented Dec 10, 2024

@mabbay this pull request can not be integrated into code-reflection 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 op-method-expriment
git fetch https://git.openjdk.org/babylon.git code-reflection
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge code-reflection"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Dec 10, 2024
# Conflicts:
#	src/jdk.incubator.code/share/classes/jdk/incubator/code/bytecode/BytecodeGenerator.java
#	test/jdk/java/lang/reflect/code/bytecode/TestVarArg.java
@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Dec 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready Pull request is ready to be integrated rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

3 participants