R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid calling LazyOptional.isPresent() if possible

Browse Source
This commit is contained in:
embeddedt 2026-02-27 22:19:04 -05:00
parent 15f30b532c
commit 49d800ff27
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/embeddedt/modernfix/forge/capability/CapabilityProviderDispatcherGenerator.java
View File

@ -1,6 +1,7 @@
package org.embeddedt.modernfix.forge.capability; package org.embeddedt.modernfix.forge.capability;
import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.common.util.LazyOptional;
import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.ModernFix;
import org.embeddedt.modernfix.forge.capability.analysis.CapabilityAnalysisResult; import org.embeddedt.modernfix.forge.capability.analysis.CapabilityAnalysisResult;
import org.embeddedt.modernfix.forge.capability.analysis.CapabilityAnalyzer; import org.embeddedt.modernfix.forge.capability.analysis.CapabilityAnalyzer;
@ -54,6 +55,12 @@ public class CapabilityProviderDispatcherGenerator {
private static final String GENERATED_CLASSES_FOLDER = System.getProperty("modernfix.generatedCapabilityDispatcherClassDumpFolder", ""); private static final String GENERATED_CLASSES_FOLDER = System.getProperty("modernfix.generatedCapabilityDispatcherClassDumpFolder", "");
/**
* Sentinel used in generated guards to skip empty results via reference equality,
* avoiding a method call to {@code isPresent()}.
*/
public static final LazyOptional<?> EMPTY = LazyOptional.empty();
private static final ConcurrentHashMap<List<Class<? extends ICapabilityProvider>>, MethodHandle> cache = private static final ConcurrentHashMap<List<Class<? extends ICapabilityProvider>>, MethodHandle> cache =
new ConcurrentHashMap<>(); new ConcurrentHashMap<>();
@ -401,9 +408,16 @@ public class CapabilityProviderDispatcherGenerator {
di++; di++;
} }
// if (result == null) goto next // If not a hash lookup, then optimistically check for the exact LazyOptional.empty() value to avoid
mv.visitVarInsn(ALOAD, 3); // an isPresent call
mv.visitJumpInsn(IFNULL, nextLabel); if (!(dispatch instanceof ProviderDispatch.Hash)) {
// if (result == EMPTY) goto next
mv.visitVarInsn(ALOAD, 3);
mv.visitFieldInsn(GETSTATIC,
"org/embeddedt/modernfix/forge/capability/CapabilityProviderDispatcherGenerator",
"EMPTY", LAZY_OPTIONAL_DESC);
mv.visitJumpInsn(IF_ACMPEQ, nextLabel);
}
// if (result.isPresent()) return result // if (result.isPresent()) return result
mv.visitVarInsn(ALOAD, 3); mv.visitVarInsn(ALOAD, 3);