- Speling

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 6f75b14bbae5d054cce8b3e65fd63a6dc4a98286..b5dabb3ef4ed86ce0dd8cc90909a6caba7043c69 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1790,7 +1790,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, ANY, CONST|TMP|VAR|UNUSED|CV)
                        zend_error_noreturn(E_ERROR, "Can not call constructor");
                }
                if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
-                       zend_error(E_COMPILE_ERROR, "Cannot call private %v::__constrcut()", ce->name);
+                       zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
                }
                EX(fbc) = ce->constructor;
        }

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 7b8b94f1b7060aa6b533ca87335c3b4cfe96adee..f2240949ad1c0322470830f1ea556640f9f4f1e6 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -681,7 +681,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
                        zend_error_noreturn(E_ERROR, "Can not call constructor");
                }
                if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
-                       zend_error(E_COMPILE_ERROR, "Cannot call private %v::__constrcut()", ce->name);
+                       zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
                }
                EX(fbc) = ce->constructor;
        }
@@ -902,7 +902,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
                        zend_error_noreturn(E_ERROR, "Can not call constructor");
                }
                if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
-                       zend_error(E_COMPILE_ERROR, "Cannot call private %v::__constrcut()", ce->name);
+                       zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
                }
                EX(fbc) = ce->constructor;
        }
@@ -1038,7 +1038,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
                        zend_error_noreturn(E_ERROR, "Can not call constructor");
                }
                if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
-                       zend_error(E_COMPILE_ERROR, "Cannot call private %v::__constrcut()", ce->name);
+                       zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
                }
                EX(fbc) = ce->constructor;
        }
@@ -1173,7 +1173,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_
                        zend_error_noreturn(E_ERROR, "Can not call constructor");
                }
                if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
-                       zend_error(E_COMPILE_ERROR, "Cannot call private %v::__constrcut()", ce->name);
+                       zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
                }
                EX(fbc) = ce->constructor;
        }
@@ -1266,7 +1266,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
                        zend_error_noreturn(E_ERROR, "Can not call constructor");
                }
                if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
-                       zend_error(E_COMPILE_ERROR, "Cannot call private %v::__constrcut()", ce->name);
+                       zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
                }
                EX(fbc) = ce->constructor;
        }
@@ -14239,7 +14239,6 @@ static int ZEND_FETCH_OBJ_W_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        }
        if (IS_VAR == IS_VAR && (free_op1.var != NULL) &&
-           READY_TO_DESTROY(free_op1.var) &&
            READY_TO_DESTROY(free_op1.var) &&
            !RETURN_VALUE_UNUSED(&opline->result)) {
                AI_USE_PTR(EX_T(opline->result.u.var).var);
@@ -14264,6 +14263,7 @@ static int ZEND_FETCH_OBJ_RW_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        }
        if (IS_VAR == IS_VAR && (free_op1.var != NULL) &&
+           READY_TO_DESTROY(free_op1.var) &&
            !RETURN_VALUE_UNUSED(&opline->result)) {
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
@@ -14328,6 +14328,7 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        }
        if (IS_VAR == IS_VAR && (free_op1.var != NULL) &&
+           READY_TO_DESTROY(free_op1.var) &&
            !RETURN_VALUE_UNUSED(&opline->result)) {
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
@@ -15553,6 +15554,7 @@ static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        }
        if (IS_UNUSED == IS_VAR && 0 &&
+           READY_TO_DESTROY(free_op1.var) &&
            !RETURN_VALUE_UNUSED(&opline->result)) {
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
@@ -15617,6 +15619,7 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
 
        }
        if (IS_UNUSED == IS_VAR && 0 &&
+           READY_TO_DESTROY(free_op1.var) &&
            !RETURN_VALUE_UNUSED(&opline->result)) {
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
@@ -16720,6 +16723,7 @@ static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                zval_dtor(free_op2.var);
        }
        if (IS_UNUSED == IS_VAR && 0 &&
+           READY_TO_DESTROY(free_op1.var) &&
            !RETURN_VALUE_UNUSED(&opline->result)) {
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
@@ -16784,6 +16788,7 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
                zval_dtor(free_op2.var);
        }
        if (IS_UNUSED == IS_VAR && 0 &&
+           READY_TO_DESTROY(free_op1.var) &&
            !RETURN_VALUE_UNUSED(&opline->result)) {
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }

diff --git a/tests/classes/ctor_visibility.phpt b/tests/classes/ctor_visibility.phpt
index afc823cb82d618fa7c52cc014af6d2c159695f1f..8d3b1c5c501be33ac19a22c861d75143f578ed02 100755 (executable)
--- a/tests/classes/ctor_visibility.phpt
+++ b/tests/classes/ctor_visibility.phpt
@@ -66,4 +66,4 @@ Test::__construct()
 TestPriv::__construct()
 DerivedPriv::__construct()
 
-Fatal error: Cannot call private TestPriv::__constrcut() in %sctor_visibility.php on line %d
+Fatal error: Cannot call private TestPriv::__construct() in %sctor_visibility.php on line %d