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.

Sign up for GitHub

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

8340710: Optimize DirectClassBuilder::build #21118

Closed
wants to merge 10 commits into from
+46 −19
Closed

8340710: Optimize DirectClassBuilder::build #21118

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
211aa8a
optimize DirectClassBuilder::build
wenshao Sep 22, 2024
417aeab
optimize for writeExceptionHandlers for C1
wenshao Sep 22, 2024
2d6e224
force inline invalidIndex
wenshao Sep 22, 2024
929e5bf
force inline writeU2
wenshao Sep 22, 2024
ae195bc
force inline Util::writeAttributes & Util::writeList
wenshao Sep 22, 2024
59e6c69
suggestion from @liach
wenshao Sep 22, 2024
590d4b8
fix write header
wenshao Sep 22, 2024
2129e0a
inline writeLong & local constantPool
wenshao Sep 23, 2024
f144a0a
suggestion from @liach
wenshao Sep 24, 2024
993fc7c
Merge remote-tracking branch 'upstream/master' into optim_classfile_b…
wenshao Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/java.base/share/classes/jdk/internal/classfile/impl/BufWriterImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
import jdk.internal.access.SharedSecrets;
import jdk.internal.vm.annotation.ForceInline;

import static java.lang.classfile.ClassFile.MAGIC_NUMBER;

public final class BufWriterImpl implements BufWriter {
private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();

Expand Down Expand Up @@ -94,6 +96,10 @@ public ClassFileImpl context() {
return context;
}

void writeMagic(int minorVersion, int majorVersion) {
Copy link
Member

Choose a reason for hiding this comment

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

Can we call this writeHeader as this writes both the magic and the version?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Now, through the local variable constantPool, codeSize < 325 can be achieved without extracting a separate method.

writeLong((((long) MAGIC_NUMBER) << 32) | ((minorVersion & 0xFFFFL) << 16) | majorVersion);
}

@Override
public void writeU1(int x) {
reserveSpace(1);
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/jdk/internal/classfile/impl/DirectClassBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ else if ((flags & ClassFile.ACC_MODULE) == 0 && !"java/lang/Object".equals(thisC
}

// Now we can make the head
head.writeLong(((long) ClassFile.MAGIC_NUMBER) << 32 | minorVersion << 16 | majorVersion);
head.writeMagic(minorVersion, majorVersion);
constantPool.writeTo(head);
head.writeU2(flags);
head.writeIndex(thisClassEntry);
Expand Down