Make sure aroundInvoke interceptors get correct method parameters

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java

@@ -1428,8 +1428,14 @@ void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreat
                         annotationLiterals.create(create, bindingClass, binding));
             }
 
+            // ResultHandle of Object[] holding all constructor args
+            ResultHandle ctorArgsArray = create.newArray(Object.class, create.load(providerHandles.size()));
+            for (int i = 0; i < providerHandles.size(); i++) {
+                create.writeArrayValue(ctorArgsArray, i, providerHandles.get(i));
+            }
             ResultHandle invocationContextHandle = create.invokeStaticMethod(
                     MethodDescriptors.INVOCATION_CONTEXTS_AROUND_CONSTRUCT, constructorHandle,
+                    ctorArgsArray,
                     aroundConstructsHandle, func.getInstance(),
                     create.invokeStaticMethod(MethodDescriptors.SETS_OF, bindingsArray));
             TryBlock tryCatch = create.tryBlock();

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java

@@ -170,7 +170,7 @@ public final class MethodDescriptors {
     public static final MethodDescriptor INVOCATION_CONTEXTS_AROUND_CONSTRUCT = MethodDescriptor.ofMethod(
             InvocationContexts.class,
             "aroundConstruct",
-            InvocationContext.class, Constructor.class, List.class, Supplier.class, Set.class);
+            InvocationContext.class, Constructor.class, Object[].class, List.class, Supplier.class, Set.class);
 
     public static final MethodDescriptor INVOCATION_CONTEXTS_POST_CONSTRUCT = MethodDescriptor.ofMethod(
             InvocationContexts.class,

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AroundConstructInvocationContext.java

@@ -13,9 +13,9 @@ class AroundConstructInvocationContext extends LifecycleCallbackInvocationContex
 
     private final Supplier<Object> aroundConstructForward;
 
-    AroundConstructInvocationContext(Constructor<?> constructor, Set<Annotation> interceptorBindings,
+    AroundConstructInvocationContext(Constructor<?> constructor, Object[] parameters, Set<Annotation> interceptorBindings,
             List<InterceptorInvocation> chain, Supplier<Object> aroundConstructForward) {
-        super(null, constructor, interceptorBindings, chain);
+        super(null, constructor, parameters, interceptorBindings, chain);
         this.aroundConstructForward = aroundConstructForward;
     }
 

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InvocationContexts.java

@@ -42,7 +42,7 @@ public static Object performAroundInvoke(Object target, Method method,
      */
     public static InvocationContext postConstruct(Object target, List<InterceptorInvocation> chain,
             Set<Annotation> interceptorBindings) {
-        return new LifecycleCallbackInvocationContext(target, null, interceptorBindings, chain);
+        return new LifecycleCallbackInvocationContext(target, null, null, interceptorBindings, chain);
     }
 
     /**
@@ -54,7 +54,7 @@ public static InvocationContext postConstruct(Object target, List<InterceptorInv
      */
     public static InvocationContext preDestroy(Object target, List<InterceptorInvocation> chain,
             Set<Annotation> interceptorBindings) {
-        return new LifecycleCallbackInvocationContext(target, null, interceptorBindings, chain);
+        return new LifecycleCallbackInvocationContext(target, null, null, interceptorBindings, chain);
     }
 
     /**
@@ -65,10 +65,12 @@ public static InvocationContext preDestroy(Object target, List<InterceptorInvoca
      * @return a new {@link javax.interceptor.AroundConstruct} invocation context
      */
     public static InvocationContext aroundConstruct(Constructor<?> constructor,
+            Object[] parameters,
             List<InterceptorInvocation> chain,
             Supplier<Object> aroundConstructForward,
             Set<Annotation> interceptorBindings) {
-        return new AroundConstructInvocationContext(constructor, interceptorBindings, chain, aroundConstructForward);
+        return new AroundConstructInvocationContext(constructor, parameters, interceptorBindings, chain,
+                aroundConstructForward);
     }
 
 }

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LifecycleCallbackInvocationContext.java

@@ -15,9 +15,9 @@ class LifecycleCallbackInvocationContext extends AbstractInvocationContext {
 
     private int position = 0;
 
-    LifecycleCallbackInvocationContext(Object target, Constructor<?> constructor, Set<Annotation> interceptorBindings,
-            List<InterceptorInvocation> chain) {
-        super(target, null, constructor, null, null, interceptorBindings, chain);
+    LifecycleCallbackInvocationContext(Object target, Constructor<?> constructor, Object[] parameters,
+            Set<Annotation> interceptorBindings, List<InterceptorInvocation> chain) {
+        super(target, null, constructor, parameters, null, interceptorBindings, chain);
     }
 
     @Override

independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructTest.java

@@ -1,9 +1,12 @@
 package io.quarkus.arc.test.interceptors.aroundconstruct;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.interceptor.AroundConstruct;
 import javax.interceptor.Interceptor;
@@ -20,7 +23,7 @@ public class AroundConstructTest {
 
     @RegisterExtension
     public ArcTestContainer container = new ArcTestContainer(MyTransactional.class, SimpleBean.class,
-            SimpleInterceptor.class);
+            SimpleInterceptor.class, MyDependency.class);
 
     public static AtomicBoolean INTERCEPTOR_CALLED = new AtomicBoolean(false);
 
@@ -35,6 +38,25 @@ public void testInterception() {
     @MyTransactional
     static class SimpleBean {
 
+        @Inject
+        SimpleBean(MyDependency foo) {
+
+        }
+
+    }
+
+    @Singleton
+    static class MyDependency {
+
+        long created;
+
+        MyDependency() {
+            created = System.currentTimeMillis();
+        }
+
+        public long getCreated() {
+            return created;
+        }
     }
 
     @MyTransactional
@@ -44,6 +66,10 @@ public static class SimpleInterceptor {
         @AroundConstruct
         void mySuperCoolAroundConstruct(InvocationContext ctx) throws Exception {
             INTERCEPTOR_CALLED.set(true);
+            assertTrue(ctx.getParameters().length == 1);
+            Object param = ctx.getParameters()[0];
+            assertTrue(param instanceof MyDependency);
+            assertEquals(Arc.container().instance(MyDependency.class).get().getCreated(), ((MyDependency) param).getCreated());
             ctx.proceed();
         }