Changeset 6487947 in git
- Timestamp:
- 2011-04-09T11:41:07Z (9 years ago)
- Branches:
- 3.0, 3.1, 3.2, master, trunk
- Children:
- 4299945
- Parents:
- e2a871e
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
Decompiler.class.php
r0bb8833 r6487947 801 801 case ZEND_FETCH_CLASS_PARENT: 802 802 $class = 'parent'; 803 } 803 break; 804 case ZEND_FETCH_CLASS_STATIC: 805 $class = 'static'; 806 break; 807 } 808 $istmpres = true; 804 809 } 805 810 else { … … 1063 1068 } 1064 1069 array_push($EX['arg_types_stack'], array($EX['fbc'], $EX['object'], $EX['called_scope'])); 1065 if ($opc == XC_INIT_STATIC_METHOD_CALL) { 1066 $EX['object'] = null; 1067 $EX['called_scope'] = $op1['var']; 1068 } 1069 else if ($opc == XC_INIT_METHOD_CALL || $op1['op_type'] != XC_IS_UNUSED) { 1070 if ($opc == XC_INIT_STATIC_METHOD_CALL || $opc == XC_INIT_METHOD_CALL || $op1['op_type'] != XC_IS_UNUSED) { 1070 1071 $obj = $this->getOpVal($op1, $EX); 1071 1072 if (!isset($obj)) { 1072 1073 $obj = '$this'; 1073 1074 } 1074 // looks like PHP4 only 1075 if (isset($op1['constant'])) { 1075 if ($opc == XC_INIT_STATIC_METHOD_CALL || /* PHP4 */ isset($op1['constant'])) { 1076 1076 $EX['object'] = null; 1077 1077 $EX['called_scope'] = $this->unquoteName($obj); … … 1865 1865 define('ZEND_FETCH_CLASS_AUTO', 5); 1866 1866 define('ZEND_FETCH_CLASS_INTERFACE', 6); 1867 define('ZEND_FETCH_CLASS_STATIC', 7); 1867 1868 1868 1869 define('ZEND_EVAL', (1<<0)); -
opcode_spec_def.h
rb7195c1 r6487947 172 172 173 173 OPSPEC( UNUSED, STD, STD, VAR) /* 112 INIT_METHOD_CALL */ 174 # ifdef ZEND_ENGINE_2_3 175 OPSPEC( UNUSED, STD, STD, UNUSED) /* 113 INIT_STATIC_METHOD_CALL */ 176 # else 174 177 OPSPEC( UNUSED, UCLASS, STD, UNUSED) /* 113 INIT_STATIC_METHOD_CALL */ 178 # endif 175 179 OPSPEC( ISSET, STD, FETCH, TMP) /* 114 ISSET_ISEMPTY_VAR */ 176 180 OPSPEC( ISSET, STD, STD, TMP) /* 115 ISSET_ISEMPTY_DIM_OBJ */
Note: See TracChangeset
for help on using the changeset viewer.