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

ArC: optimize "List all" injection points #45526

Merged
merged 1 commit into from
Jan 13, 2025
Merged

ArC: optimize "List all" injection points #45526

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 39 additions & 20 deletions independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Collectors;

import jakarta.enterprise.inject.spi.DefinitionException;
import jakarta.enterprise.inject.spi.InjectionPoint;
Expand Down Expand Up @@ -407,31 +408,49 @@ private static void generateListBytecode(GeneratorContext ctx) {
requiredType = Types.getTypeHandle(mc, type);
usesInstanceHandle = mc.load(false);
}

ResultHandle qualifiers = BeanGenerator.collectInjectionPointQualifiers(
ctx.beanDeployment,
ctx.constructor, ctx.injectionPoint, ctx.annotationLiterals);
ResultHandle annotationsHandle = BeanGenerator.collectInjectionPointAnnotations(
ctx.beanDeployment,
ctx.constructor, ctx.injectionPoint, ctx.annotationLiterals, ctx.injectionPointAnnotationsPredicate);
ResultHandle javaMemberHandle = BeanGenerator.getJavaMemberHandle(ctx.constructor, ctx.injectionPoint,
ctx.reflectionRegistration);

// Note that we only collect the injection point metadata if needed, i.e. if any of the resolved beans is dependent,
// and requires InjectionPoint metadata
Set<BeanInfo> beans = ctx.beanDeployment.beanResolver.resolveBeans(
type.name().equals(DotNames.INSTANCE_HANDLE) ? type.asParameterizedType().arguments().get(0) : type,
ctx.injectionPoint.getRequiredQualifiers().stream().filter(a -> !a.name().equals(DotNames.ALL))
.collect(Collectors.toSet()));
boolean collectMetadata = beans.stream()
.anyMatch(b -> BuiltinScope.DEPENDENT.isDeclaredBy(b) && b.requiresInjectionPointMetadata());

ResultHandle annotationsHandle;
ResultHandle javaMemberHandle;
ResultHandle beanHandle;
switch (ctx.targetInfo.kind()) {
case OBSERVER:
// For observers the first argument is always the declaring bean
beanHandle = ctx.constructor.invokeInterfaceMethod(
MethodDescriptors.SUPPLIER_GET, ctx.constructor.getMethodParam(0));
break;
case BEAN:
beanHandle = ctx.constructor.getThis();
break;
case INVOKER:
beanHandle = loadInvokerTargetBean(ctx.targetInfo.asInvoker(), ctx.constructor);
break;
default:
throw new IllegalStateException("Unsupported target info: " + ctx.targetInfo);
if (collectMetadata) {
annotationsHandle = BeanGenerator.collectInjectionPointAnnotations(
ctx.beanDeployment,
ctx.constructor, ctx.injectionPoint, ctx.annotationLiterals, ctx.injectionPointAnnotationsPredicate);
javaMemberHandle = BeanGenerator.getJavaMemberHandle(ctx.constructor, ctx.injectionPoint,
ctx.reflectionRegistration);
switch (ctx.targetInfo.kind()) {
case OBSERVER:
// For observers the first argument is always the declaring bean
beanHandle = ctx.constructor.invokeInterfaceMethod(
MethodDescriptors.SUPPLIER_GET, ctx.constructor.getMethodParam(0));
break;
case BEAN:
beanHandle = ctx.constructor.getThis();
break;
case INVOKER:
beanHandle = loadInvokerTargetBean(ctx.targetInfo.asInvoker(), ctx.constructor);
break;
default:
throw new IllegalStateException("Unsupported target info: " + ctx.targetInfo);
}
} else {
annotationsHandle = ctx.constructor.loadNull();
javaMemberHandle = ctx.constructor.loadNull();
beanHandle = ctx.constructor.loadNull();
}

ResultHandle listProvider = ctx.constructor.newInstance(
MethodDescriptor.ofConstructor(ListProvider.class, java.lang.reflect.Type.class, java.lang.reflect.Type.class,
Set.class,
Expand Down
Loading