Optimize arguments popper

m3m0r7 · m3m0r7 · commit 0271b9c808ff · 2019-04-29T13:20:13.000+09:00
diff --git a/src/Kernel/Mnemonics/_invokespecial.php b/src/Kernel/Mnemonics/_invokespecial.php
@@ -6,6 +6,7 @@
 use PHPJava\Exceptions\UnableToCatchException;
 use PHPJava\Kernel\Attributes\CodeAttribute;
 use PHPJava\Kernel\Structures\_ExceptionTable;
+use PHPJava\Utilities\AttributionResolver;
 use PHPJava\Utilities\BinaryTool;
 use PHPJava\Utilities\Formatter;
 use PHPJava\Utilities\MethodNameResolver;
@@ -26,8 +27,8 @@ public function execute(): void
         $parsedSignature = Formatter::parseSignature($signature);
         $invokerClass = $this->popFromOperandStack();
 
-        $arguments = [];
 
+        $arguments = array_fill(0, $parsedSignature['arguments_count'] - 1, null);
         for ($i = $parsedSignature['arguments_count'] - 1; $i >= 0; $i--) {
             $arguments[$i] = $this->popFromOperandStack();
         }
@@ -61,21 +62,6 @@ public function execute(): void
                         ...$arguments
                     );
             } else {
-                $reflectionClass = new \ReflectionClass(
-                    $realInvokerClass = TypeResolver::convertPHPTypeToJavaType($invokerClass)
-                );
-                $methodAccessor = $reflectionClass->getMethod($methodName);
-
-                if ($document = $methodAccessor->getDocComment()) {
-                    $prependInjections = $this->getNativeAnnotateInjections($document);
-                    if (!empty($prependInjections)) {
-                        array_unshift(
-                            $arguments,
-                            ...$prependInjections
-                        );
-                    }
-                }
-
                 $result = call_user_func_array(
                     [
                         $invokerClass,
diff --git a/src/Kernel/Mnemonics/_invokestatic.php b/src/Kernel/Mnemonics/_invokestatic.php
@@ -24,13 +24,13 @@ public function execute(): void
         $cp = $cpInfo[$this->readUnsignedShort()];
         $methodName = $cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getNameIndex()]->getString();
         $signature = Formatter::parseSignature($cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getDescriptorIndex()]->getString());
-        $arguments = [];
 
         $this->getOptions('class_resolver')
             ->resolve($cpInfo[$cpInfo[$cp->getClassIndex()]->getClassIndex()]->getString());
         [$resourceType, $classObject] = $this->getOptions('class_resolver')
             ->resolve($cpInfo[$cpInfo[$cp->getClassIndex()]->getClassIndex()]->getString());
 
+        $arguments = array_fill(0, $signature['arguments_count'] - 1, null);
         for ($i = $signature['arguments_count'] - 1; $i >= 0; $i--) {
             $arguments[$i] = $this->popFromOperandStack();
         }
diff --git a/src/Kernel/Mnemonics/_invokevirtual.php b/src/Kernel/Mnemonics/_invokevirtual.php
@@ -28,8 +28,8 @@ public function execute(): void
 
         // signature
         $signature = Formatter::parseSignature($cpInfo[$nameAndTypeIndex->getDescriptorIndex()]->getString());
-        $arguments = [];
 
+        $arguments = array_fill(0, $signature['arguments_count'] - 1, null);
         for ($i = $signature['arguments_count'] - 1; $i >= 0; $i--) {
             $arguments[$i] = $this->popFromOperandStack();
         }
diff --git a/src/Kernel/Types/Type.php b/src/Kernel/Types/Type.php
@@ -13,10 +13,7 @@ class Type
     public function __construct($value)
     {
         // Validate value which is scalar.
-        if (!is_int($value) &&
-            !is_float($value) &&
-            !is_string($value) &&
-            !is_bool($value) &&
+        if (!is_scalar($value) &&
             !is_array($value) &&
             !is_null($value) &&
             !($value instanceof self)

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ public function execute(): void`
`28`	`28`
`29`	`29`	`// signature`
`30`	`30`	`$signature = Formatter::parseSignature($cpInfo[$nameAndTypeIndex->getDescriptorIndex()]->getString());`
`31`		`- $arguments = [];`
`32`	`31`
	`32`	`+ $arguments = array_fill(0, $signature['arguments_count'] - 1, null);`
`33`	`33`	`for ($i = $signature['arguments_count'] - 1; $i >= 0; $i--) {`
`34`	`34`	`$arguments[$i] = $this->popFromOperandStack();`
`35`	`35`	`}`