Skip to content

Update version and enhance hidden class instantiation #273

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

Merged
twisti-dev merged 2 commits into from
Mar 31, 2026
Merged

Update version and enhance hidden class instantiation #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7950ad6
feat: update version to 1.21.11-2.73.1 and enhance hidden class insta…
twisti-dev Mar 31, 2026
a18ed4b
Merge branch 'version/1.21.11' into fix/package-private-template-access
twisti-dev Mar 31, 2026
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
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
javaVersion=25
mcVersion=1.21.11
group=dev.slne.surf
version=1.21.11-2.73.0
version=1.21.11-2.73.1
relocationPrefix=dev.slne.surf.surfapi.libs
snapshot=false
13 changes: 8 additions & 5 deletions ...-api-core-api/src/main/java/dev/slne/surf/surfapi/core/api/invoker/HiddenInvokerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,13 @@ static <I> I createInvoker(
final List<Object> classData = List.of(target, payloadClass, method, privateLookupIn, isSuspend);
final MethodHandles.Lookup hiddenClassLookup = lookup.defineHiddenClassWithClassData(templateBytes, classData, true);

return hiddenClassLookup.lookupClass()
.asSubclass(invokerInterface)
.getDeclaredConstructor()
.newInstance();
final MethodHandle constructor = hiddenClassLookup.findConstructor(hiddenClassLookup.lookupClass(), MethodType.methodType(void.class));

try {
return invokerInterface.cast(constructor.invoke());
} catch (Throwable e) {
Copy link

Copilot AI Mar 31, 2026

Choose a reason for hiding this comment

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

The new catch (Throwable e) wraps all Errors (e.g., OutOfMemoryError, StackOverflowError) into a ReflectiveOperationException, which can mask fatal JVM conditions and change failure semantics. Consider rethrowing Error (or at least VirtualMachineError/ThreadDeath/LinkageError) and only wrapping non-fatal throwables from MethodHandle.invoke() into ReflectiveOperationException.

Suggested change
} catch (Throwable e) {
} catch (Throwable e) {
if (e instanceof Error) {
throw (Error) e;
}

Copilot uses AI. Check for mistakes.
throw new ReflectiveOperationException("Failed to instantiate hidden class", e);
}
}

/**
Expand Down Expand Up @@ -192,7 +195,7 @@ public static InvokerClassData loadClassData(
* the hidden class.
* @param methodType the expected {@link MethodType} for non-suspend handler methods.
* @return an {@link InvokerClassData} instance containing the resolved handler method
* information, along with metadata on whether it's a suspend function.
* information, along with metadata on whether it's a suspend function.
Copy link

Copilot AI Mar 31, 2026

Choose a reason for hiding this comment

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

JavaDoc formatting regression: the continuation line after @return lost indentation/alignment (* information, ...). This reads like a paragraph break and is inconsistent with the surrounding JavaDoc style; re-indent to keep the wrapped @return description aligned.

Suggested change
* information, along with metadata on whether it's a suspend function.
* information, along with metadata on whether it's a suspend function.

Copilot uses AI. Check for mistakes.
* @throws ReflectiveOperationException if class data extraction or handle resolution fails.
*/
public static InvokerClassData loadClassDataWithAutoSuspend(
Expand Down