Changeset 6487947 in git

Timestamp:

2011-04-09T11:41:07Z (8 years ago)

Author:

Xuefer <xuefer@…>

Branches:

3.0, 3.1, 3.2, master, trunk

Children:

4299945

Parents:

e2a871e

Message:

method call decompile fix

git-svn-id: ​svn://svn.lighttpd.net/xcache/trunk@722 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Files:

• Decompiler.class.php (modified) (3 diffs)
• opcode_spec_def.h (modified) (1 diff)

Decompiler.class.php

@@ -801 +801 @@
                         case ZEND_FETCH_CLASS_PARENT:
                             $class = 'parent';
-                        }
+                            break;
+                        case ZEND_FETCH_CLASS_STATIC:
+                            $class = 'static';
+                            break;
+                        }
+                        $istmpres = true;
                     }
                     else {
@@ -1063 +1068 @@
                     }
                     array_push($EX['arg_types_stack'], array($EX['fbc'], $EX['object'], $EX['called_scope']));
-                    if ($opc == XC_INIT_STATIC_METHOD_CALL) {
-                        $EX['object'] = null;
-                        $EX['called_scope'] = $op1['var'];
-                    }
-                    else if ($opc == XC_INIT_METHOD_CALL || $op1['op_type'] != XC_IS_UNUSED) {
+                    if ($opc == XC_INIT_STATIC_METHOD_CALL || $opc == XC_INIT_METHOD_CALL || $op1['op_type'] != XC_IS_UNUSED) {
                         $obj = $this->getOpVal($op1, $EX);
                         if (!isset($obj)) {
                             $obj = '$this';
                         }
-                        // looks like PHP4 only
-                        if (isset($op1['constant'])) {
+                        if ($opc == XC_INIT_STATIC_METHOD_CALL || /* PHP4 */ isset($op1['constant'])) {
                             $EX['object'] = null;
                             $EX['called_scope'] = $this->unquoteName($obj);
@@ -1865 +1865 @@
 define('ZEND_FETCH_CLASS_AUTO',       5);
 define('ZEND_FETCH_CLASS_INTERFACE',  6);
+define('ZEND_FETCH_CLASS_STATIC',     7);
 
 define('ZEND_EVAL',               (1<<0));

opcode_spec_def.h

@@ -172 +172 @@
 
     OPSPEC(    UNUSED,        STD,        STD,        VAR) /* 112 INIT_METHOD_CALL               */
+#   ifdef ZEND_ENGINE_2_3
+    OPSPEC(    UNUSED,        STD,        STD,     UNUSED) /* 113 INIT_STATIC_METHOD_CALL        */
+#   else
     OPSPEC(    UNUSED,     UCLASS,        STD,     UNUSED) /* 113 INIT_STATIC_METHOD_CALL        */
+#   endif
     OPSPEC(     ISSET,        STD,      FETCH,        TMP) /* 114 ISSET_ISEMPTY_VAR              */
     OPSPEC(     ISSET,        STD,        STD,        TMP) /* 115 ISSET_ISEMPTY_DIM_OBJ          */