Update

m3m0r7 · m3m0r7 · commit 1f74cbe3bdd4 · 2019-04-28T14:45:48.000+09:00
diff --git a/src/Core/JVM/Cache/Cache.php b/src/Core/JVM/Cache/Cache.php
@@ -3,13 +3,13 @@
 
 class Cache
 {
-    private $items = [];
+    private static $items = [];
 
-    public function fetchOrPush(string $key, callable $pushFunction)
+    public static function fetchOrPush(string $key, callable $pushFunction, ...$parameters)
     {
-        if (isset($this->items[$key])) {
-            return $this->items[$key];
+        if (isset(self::$items[$key])) {
+            return self::$items[$key];
         }
-        return $this->items[$key] = $pushFunction();
+        return self::$items[$key] = $pushFunction(...$parameters);
     }
 }
diff --git a/src/Core/JVM/Cache/HeapCache.php b/src/Core/JVM/Cache/HeapCache.php
@@ -0,0 +1,6 @@
+<?php
+namespace PHPJava\Core\JVM\Cache;
+
+class HeapCache extends Cache
+{
+}
diff --git a/src/Core/JVM/Invoker/Invokable.php b/src/Core/JVM/Invoker/Invokable.php
@@ -229,7 +229,7 @@ function ($item) {
                 ]
             )
         );
-        $operationCache = new OperationCache();
+
         while ($reader->getOffset() < $codeAttribute->getOpCodeLength()) {
             if (++$executedCounter > ($this->options['max_stack_exceeded'] ?? GlobalOptions::get('max_stack_exceeded') ?? Runtime::MAX_STACK_EXCEEDED)) {
                 throw new RuntimeException(
@@ -296,23 +296,23 @@ function ($item) {
             /**
              * @var OperationInterface|Accumulator|ConstantPool $executor
              */
-            $executor = $operationCache->fetchOrPush(
+            $executor = OperationCache::fetchOrPush(
                 $fullName,
-                function () use ($fullName) {
-                    return new $fullName();
+                function () use ($fullName, &$currentConstantPool) {
+                    return (new $fullName())
+                        ->setConstantPool($currentConstantPool);
                 }
             );
-            $executor = new $fullName();
-            $executor->setConstantPool($currentConstantPool);
-            $executor->setParameters(
-                $method->getAttributes(),
-                $this->javaClassInvoker,
-                $reader,
-                $localStorage,
-                $stacks,
-                $pointer
-            );
-            $returnValue = $executor->execute();
+            $returnValue = $executor
+                ->setParameters(
+                    $method->getAttributes(),
+                    $this->javaClassInvoker,
+                    $reader,
+                    $localStorage,
+                    $stacks,
+                    $pointer
+                )
+                ->execute();
 
             $afterTrigger = $this->options['operations']['injections']['after'] ?? GlobalOptions::get('operations.injections.after');
             if (is_callable($afterTrigger)) {
diff --git a/src/Kernel/Core/Accumulator.php b/src/Kernel/Core/Accumulator.php
@@ -37,16 +37,16 @@ public function setParameters(
         \PHPJava\Core\JVM\Stream\BinaryReader $reader,
         array &$localStorage,
         array &$stacks,
-        int $pointer
+        int &$pointer
     ): self {
-        $this->attributes = $attributes;
-        $this->javaClassInvoker = $javaClassInvoker;
+        $this->attributes = &$attributes;
+        $this->javaClassInvoker = &$javaClassInvoker;
         $this->javaClass = $javaClassInvoker->getJavaClass();
         $this->options = $this->javaClass->getOptions();
-        $this->reader = $reader;
+        $this->reader = &$reader;
         $this->localStorage = &$localStorage;
         $this->stacks = &$stacks;
-        $this->pointer = $pointer;
+        $this->pointer = &$pointer;
         return $this;
     }
 
diff --git a/src/Kernel/Types/Type.php b/src/Kernel/Types/Type.php
@@ -1,6 +1,7 @@
 <?php
 namespace PHPJava\Kernel\Types;
 
+use PHPJava\Core\JVM\Cache\HeapCache;
 use PHPJava\Exceptions\TypeException;
 
 class Type

Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,13 @@`
`3`	`3`
`4`	`4`	`class Cache`
`5`	`5`	`{`
`6`		`- private $items = [];`
	`6`	`+ private static $items = [];`
`7`	`7`
`8`		`- public function fetchOrPush(string $key, callable $pushFunction)`
	`8`	`+ public static function fetchOrPush(string $key, callable $pushFunction, ...$parameters)`
`9`	`9`	`{`
`10`		`- if (isset($this->items[$key])) {`
`11`		`- return $this->items[$key];`
	`10`	`+ if (isset(self::$items[$key])) {`
	`11`	`+ return self::$items[$key];`
`12`	`12`	`}`
`13`		`- return $this->items[$key] = $pushFunction();`
	`13`	`+ return self::$items[$key] = $pushFunction(...$parameters);`
`14`	`14`	`}`
`15`	`15`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +<?php
 +namespace PHPJava\Core\JVM\Cache;
++
 +class HeapCache extends Cache
 +{
 +}