Fix "Call to member function on unknown"

Should be "on null".

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 5984b9d9c786a2d0ef5480ede88a8b3c5fb448a5..23aa3f3afdfff3d15e0401aa684009ee3039facf 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2944,7 +2944,7 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, CONST|TMPVAR|UNUSED|CV, CONST|TMPVAR
                                        }
                                }
                                if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
-                                       GET_OP1_UNDEF_CV(object, BP_VAR_R);
+                                       object = GET_OP1_UNDEF_CV(object, BP_VAR_R);
                                        if (UNEXPECTED(EG(exception) != NULL)) {
                                                FREE_OP2();
                                                HANDLE_EXCEPTION();

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 36bcd9452b4ef32292150dd36e1f3a8f2be00bae..e181246ede8169303c123edf11f51c7de4428e9e 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -5540,7 +5540,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CONST_CO
                                        }
                                }
                                if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
-                                       GET_OP1_UNDEF_CV(object, BP_VAR_R);
+                                       object = GET_OP1_UNDEF_CV(object, BP_VAR_R);
                                        if (UNEXPECTED(EG(exception) != NULL)) {
 
                                                HANDLE_EXCEPTION();
@@ -9278,7 +9278,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CONST_CV
                                        }
                                }
                                if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
-                                       GET_OP1_UNDEF_CV(object, BP_VAR_R);
+                                       object = GET_OP1_UNDEF_CV(object, BP_VAR_R);
                                        if (UNEXPECTED(EG(exception) != NULL)) {
 
                                                HANDLE_EXCEPTION();
@@ -11092,7 +11092,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CONST_TM
                                        }
                                }
                                if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
-                                       GET_OP1_UNDEF_CV(object, BP_VAR_R);
+                                       object = GET_OP1_UNDEF_CV(object, BP_VAR_R);
                                        if (UNEXPECTED(EG(exception) != NULL)) {
                                                zval_ptr_dtor_nogc(free_op2);
                                                HANDLE_EXCEPTION();
@@ -23792,7 +23792,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_C
                                        }
                                }
                                if (IS_UNUSED == IS_CV && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
-                                       GET_OP1_UNDEF_CV(object, BP_VAR_R);
+                                       object = GET_OP1_UNDEF_CV(object, BP_VAR_R);
                                        if (UNEXPECTED(EG(exception) != NULL)) {
 
                                                HANDLE_EXCEPTION();
@@ -26207,7 +26207,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_C
                                        }
                                }
                                if (IS_UNUSED == IS_CV && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
-                                       GET_OP1_UNDEF_CV(object, BP_VAR_R);
+                                       object = GET_OP1_UNDEF_CV(object, BP_VAR_R);
                                        if (UNEXPECTED(EG(exception) != NULL)) {
 
                                                HANDLE_EXCEPTION();
@@ -27699,7 +27699,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_T
                                        }
                                }
                                if (IS_UNUSED == IS_CV && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
-                                       GET_OP1_UNDEF_CV(object, BP_VAR_R);
+                                       object = GET_OP1_UNDEF_CV(object, BP_VAR_R);
                                        if (UNEXPECTED(EG(exception) != NULL)) {
                                                zval_ptr_dtor_nogc(free_op2);
                                                HANDLE_EXCEPTION();
@@ -31957,7 +31957,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST
                                        }
                                }
                                if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
-                                       GET_OP1_UNDEF_CV(object, BP_VAR_R);
+                                       object = GET_OP1_UNDEF_CV(object, BP_VAR_R);
                                        if (UNEXPECTED(EG(exception) != NULL)) {
 
                                                HANDLE_EXCEPTION();
@@ -37033,7 +37033,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HA
                                        }
                                }
                                if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
-                                       GET_OP1_UNDEF_CV(object, BP_VAR_R);
+                                       object = GET_OP1_UNDEF_CV(object, BP_VAR_R);
                                        if (UNEXPECTED(EG(exception) != NULL)) {
 
                                                HANDLE_EXCEPTION();
@@ -39605,7 +39605,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMPVA
                                        }
                                }
                                if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
-                                       GET_OP1_UNDEF_CV(object, BP_VAR_R);
+                                       object = GET_OP1_UNDEF_CV(object, BP_VAR_R);
                                        if (UNEXPECTED(EG(exception) != NULL)) {
                                                zval_ptr_dtor_nogc(free_op2);
                                                HANDLE_EXCEPTION();
@@ -41832,7 +41832,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_C
                                        }
                                }
                                if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
-                                       GET_OP1_UNDEF_CV(object, BP_VAR_R);
+                                       object = GET_OP1_UNDEF_CV(object, BP_VAR_R);
                                        if (UNEXPECTED(EG(exception) != NULL)) {
 
                                                HANDLE_EXCEPTION();
@@ -43972,7 +43972,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_C
                                        }
                                }
                                if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
-                                       GET_OP1_UNDEF_CV(object, BP_VAR_R);
+                                       object = GET_OP1_UNDEF_CV(object, BP_VAR_R);
                                        if (UNEXPECTED(EG(exception) != NULL)) {
 
                                                HANDLE_EXCEPTION();
@@ -45110,7 +45110,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_T
                                        }
                                }
                                if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
-                                       GET_OP1_UNDEF_CV(object, BP_VAR_R);
+                                       object = GET_OP1_UNDEF_CV(object, BP_VAR_R);
                                        if (UNEXPECTED(EG(exception) != NULL)) {
                                                zval_ptr_dtor_nogc(free_op2);
                                                HANDLE_EXCEPTION();