WIP

m3m0r7 · m3m0r7 · commit 88b0aae50ca6 · 2019-05-06T09:46:58.000+09:00
diff --git a/src/Kernel/Mnemonics/_invokedynamic.php b/src/Kernel/Mnemonics/_invokedynamic.php
@@ -111,14 +111,14 @@ public function execute(): void
                 $methodHandleType = MethodType::methodType($className);
 
                 $result = forward_static_call_array(
-                    [$factory, $name],
+                    [$factory, $methodHandledName],
                     array_merge(
                         [
                             MethodHandles::lookup(),
-                            $methodHandledName,
+                            $name,
                             $methodHandleType,
-                            $bootstrapMethodArguments[0]->getStringObject()
                         ],
+                        $bootstrapMethodArguments,
                         $arguments
                     )
                 );
diff --git a/src/Kernel/Structures/_BootstrapMethod.php b/src/Kernel/Structures/_BootstrapMethod.php
@@ -21,7 +21,7 @@ public function execute(): void
 
         $cp = $this->getConstantPool();
         for ($i = 0; $i < $this->numBootstrapArguments; $i++) {
-            $this->bootstrapArguments[] = $cp[$cp[$this->readUnsignedShort()]->getStringIndex()];
+            $this->bootstrapArguments[] = $cp[$this->readUnsignedShort()];
         }
     }
 
diff --git a/src/Packages/java/lang/invoke/LambdaMetafactory.php b/src/Packages/java/lang/invoke/LambdaMetafactory.php
@@ -64,6 +64,7 @@ public static function altMetafactory($a = null, $b = null, $c = null, $d = null
      */
     public static function metafactory($a = null, $b = null, $c = null, $d = null, $e = null, $f = null)
     {
+        var_dump(func_get_args());
         throw new NotImplementedException(__METHOD__);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public function execute(): void`
`21`	`21`
`22`	`22`	`$cp = $this->getConstantPool();`
`23`	`23`	`for ($i = 0; $i < $this->numBootstrapArguments; $i++) {`
`24`		`- $this->bootstrapArguments[] = $cp[$cp[$this->readUnsignedShort()]->getStringIndex()];`
	`24`	`+ $this->bootstrapArguments[] = $cp[$this->readUnsignedShort()];`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ public static function altMetafactory($a = null, $b = null, $c = null, $d = null`
`64`	`64`	`*/`
`65`	`65`	`public static function metafactory($a = null, $b = null, $c = null, $d = null, $e = null, $f = null)`
`66`	`66`	`{`
	`67`	`+ var_dump(func_get_args());`
`67`	`68`	`throw new NotImplementedException(__METHOD__);`
`68`	`69`	`}`
`69`	`70`	`}`