[6.0] Reduce invocation overhead for intercepted bean methods

impl/src/main/java/org/jboss/weld/Container.java

@@ -117,6 +117,9 @@ public static void initialize(String contextId, BeanManagerImpl deploymentManage
 
     private ContainerState state = ContainerState.STOPPED;
 
+    // set at the very beginning of cleanup(); a container that is not cleaned up is still registered
+    private volatile boolean cleanedUp;
+
     public Container(String contextId, BeanManagerImpl deploymentManager, ServiceRegistry deploymentServices) {
         this(contextId, deploymentManager, deploymentServices, null);
     }
@@ -141,6 +144,7 @@ public Container(String contextId, BeanManagerImpl deploymentManager, ServiceReg
      * managers, and all deployment services
      */
     public void cleanup() {
+        cleanedUp = true;
         managers.clear();
         for (BeanManagerImpl beanManager : beanDeploymentArchives.values()) {
             beanManager.cleanup();
@@ -202,6 +206,16 @@ public void putBeanDeployments(BeanDeploymentArchiveMapping bdaMapping) {
         }
     }
 
+    /**
+     * Cheap check suitable for hot paths: as long as this method returns {@code false}, this container has not been cleaned
+     * up and is therefore still registered, i.e. {@link #isSet(String)} returns {@code true} for its context id.
+     *
+     * @return {@code true} if {@link #cleanup()} has been called on this container
+     */
+    public boolean isCleanedUp() {
+        return cleanedUp;
+    }
+
     public ContainerState getState() {
         return state;
     }

impl/src/main/java/org/jboss/weld/bean/proxy/CombinedInterceptorAndDecoratorStackMethodHandler.java

@@ -15,6 +15,11 @@
  */
 public class CombinedInterceptorAndDecoratorStackMethodHandler implements StackAwareMethodHandler, Serializable {
 
+    /**
+     * The (immutable) arguments array passed to the handler by intercepted subclasses for methods without parameters.
+     */
+    public static final Object[] NO_ARGUMENTS = new Object[0];
+
     public static final CombinedInterceptorAndDecoratorStackMethodHandler NULL_INSTANCE = new CombinedInterceptorAndDecoratorStackMethodHandler() {
         @Override
         public void setInterceptorMethodHandler(InterceptorMethodHandler interceptorMethodHandler) {

impl/src/main/java/org/jboss/weld/bean/proxy/ContextBeanInstance.java

@@ -27,6 +27,7 @@
 
 import org.jboss.weld.Container;
 import org.jboss.weld.bean.ContextualInstance;
+import org.jboss.weld.bean.RIBean;
 import org.jboss.weld.contexts.CreationalContextImpl;
 import org.jboss.weld.contexts.WeldCreationalContext;
 import org.jboss.weld.injection.CurrentInjectionPoint;
@@ -53,11 +54,14 @@ public class ContextBeanInstance<T> extends AbstractBeanInstance implements Seri
     private static final long serialVersionUID = -8144230657830556503L;
     // The bean
     private transient Bean<T> bean;
+    // The same bean if it is a Weld bean (null otherwise); avoids the type check of ContextualInstance on every invocation
+    private final transient RIBean<T> riBean;
     // The bean index in the manager
     private final BeanIdentifier id;
     private final String contextId;
     // The actual type of the resulting bean instance
     private final transient Class<?> instanceType;
+    private final transient Container container;
     private final transient BeanManagerImpl manager;
     private final transient CurrentInjectionPoint currentInjectionPoint;
 
@@ -71,19 +75,25 @@ public class ContextBeanInstance<T> extends AbstractBeanInstance implements Seri
      */
     public ContextBeanInstance(Bean<T> bean, BeanIdentifier id, String contextId) {
         this.bean = bean;
+        this.riBean = bean instanceof RIBean ? cast(bean) : null;
         this.id = id;
         this.contextId = contextId;
         this.instanceType = computeInstanceType(bean);
         BeanLogger.LOG.createdContextInstance(bean, id);
-        this.manager = Container.instance(contextId).deploymentManager();
+        this.container = Container.instance(contextId);
+        this.manager = container.deploymentManager();
         this.currentInjectionPoint = manager.getServices().get(CurrentInjectionPoint.class);
     }
 
     public T getInstance() {
-        if (!Container.isSet(contextId)) {
+        // Checking the container we were created for is a single volatile read; the registry lookup in
+        // Container.isSet() is only needed once that container has been cleaned up (shut down)
+        if (container.isCleanedUp() && !Container.isSet(contextId)) {
             throw ContextLogger.LOG.contextualReferenceNotValidAfterShutdown(bean, contextId);
         }
-        T existingInstance = ContextualInstance.getIfExists(bean, manager);
+        // for an @ApplicationScoped bean this is a single volatile read of the instance cached by its strategy
+        T existingInstance = riBean != null ? ContextualInstance.getIfExists(riBean, manager)
+                : ContextualInstance.getIfExists(bean, manager);
         if (existingInstance != null) {
             return existingInstance;
         }

impl/src/main/java/org/jboss/weld/bean/proxy/InterceptedSubclassFactory.java

@@ -494,8 +494,14 @@ protected void invokeMethodHandler(ClassMethod method, MethodInformation methodI
             b.aconstNull();
         }
 
-        b.iconst(methodInfo.getParameterTypes().length);
-        b.anewarray(Object.class.getName());
+        if (methodInfo.getParameterTypes().length == 0) {
+            // share an empty array instead of allocating one upon every invocation
+            b.getstatic(COMBINED_INTERCEPTOR_AND_DECORATOR_STACK_METHOD_HANDLER_CLASS_NAME, "NO_ARGUMENTS",
+                    "[" + LJAVA_LANG_OBJECT);
+        } else {
+            b.iconst(methodInfo.getParameterTypes().length);
+            b.anewarray(Object.class.getName());
+        }
 
         int localVariableCount = 1;