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

Update openjdk.test.debugging/build.xml to build jdk-25+ using asm.jar prereq #496

Closed
wants to merge 2 commits into from

Conversation

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard andrew-m-leonard changed the title Asm Update openjdk.test.debugging/build.xml to build jdk-25+ using asm.jar prereq Feb 4, 2025
@andrew-m-leonard andrew-m-leonard self-assigned this Feb 4, 2025
@andrew-m-leonard andrew-m-leonard marked this pull request as draft February 4, 2025 12:20
@andrew-m-leonard andrew-m-leonard marked this pull request as ready for review February 4, 2025 13:04
@sophia-guo
Copy link
Contributor

The path changed from import jdk.internal.org.objectweb.asm (jdk12 - 24 ) back to import org.objectweb.asm (jdk8, 11) for jdk25+. I didn't notice there is any difference of java files between https://github.com/andrew-m-leonard/aqa-systemtest/tree/asm/openjdk.test.debugging/src_250/test.debugging/net/adoptopenjdk/test/hcrAgent/agent and https://github.com/andrew-m-leonard/aqa-systemtest/tree/asm/openjdk.test.debugging/src_80_110/test.debugging/net/adoptopenjdk/test/hcrAgent/agent. Wondered does this extra https://github.com/andrew-m-leonard/aqa-systemtest/tree/asm/openjdk.test.debugging/src_250/test.debugging/net/adoptopenjdk/test/hcrAgent/agent?* are needed?

Also the target build-java-25-plus are exactly same as build-java-above-11

Wondered could this be done by simply updating the target build-java-11 to work for 25+ as build-java-11 and 25 plus, and update build-java-above-11 to build-java-17-24?

@andrew-m-leonard
Copy link
Contributor Author

The path changed from import jdk.internal.org.objectweb.asm (jdk12 - 24 ) back to import org.objectweb.asm (jdk8, 11) for jdk25+. I didn't notice there is any difference of java files between https://github.com/andrew-m-leonard/aqa-systemtest/tree/asm/openjdk.test.debugging/src_250/test.debugging/net/adoptopenjdk/test/hcrAgent/agent and https://github.com/andrew-m-leonard/aqa-systemtest/tree/asm/openjdk.test.debugging/src_80_110/test.debugging/net/adoptopenjdk/test/hcrAgent/agent. Wondered does this extra https://github.com/andrew-m-leonard/aqa-systemtest/tree/asm/openjdk.test.debugging/src_250/test.debugging/net/adoptopenjdk/test/hcrAgent/agent?* are needed?

Also the target build-java-25-plus are exactly same as build-java-above-11

Wondered could this be done by simply updating the target build-java-11 to work for 25+ as build-java-11 and 25 plus, and update build-java-above-11 to build-java-17-24?

The imports all changed from:

import jdk.internal.org.objectweb.asm.ClassVisitor;
import jdk.internal.org.objectweb.asm.MethodVisitor;
import jdk.internal.org.objectweb.asm.Opcodes;

to

import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;

We could try changing the src_150 to have a subsitituion variable which the ant make file replaced, eg:

import %CLASSVISITOR%

but I prefer simplicity.

@andrew-m-leonard
Copy link
Contributor Author

Oh hang on, I see what you mean @sophia-guo the src_80 code is the same.... yeah didn't see that, let me check

@andrew-m-leonard
Copy link
Contributor Author

Hmm, I don't understand this, my assumption was the src_80_110 was different, but as you've highlighted @sophia-guo it is identical... Both src_80_110 and src_150 are identical apart from the "import's".
There seems to be a required to use the "JVM" Asm, but not sure why? maybe a OpenJ9 requirement? ref: eclipse-openj9/openj9#11642 (comment)

I'm going to close this, as this needs further consideration, maybe by J9 team?

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

Successfully merging this pull request may close these issues.

jdk-25+ STF build broken by move of ASM classes from java.base
2 participants