]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1
authorBob Weinand <bobwei9@hotmail.com>
Tue, 18 Oct 2016 12:31:49 +0000 (14:31 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Tue, 18 Oct 2016 12:31:49 +0000 (14:31 +0200)
1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

index 253443003e393c8bdfe3074d9506ab5717c250f8,6693ef316ff11d4526c6dc44d5c0a04ad340b74a..78342a06369840fdb5c95079b064e484d6a1622c
@@@ -3239,13 -3024,10 +3246,10 @@@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_C
        call->prev_execute_data = EX(call);
        EX(call) = call;
  
-       FREE_OP2();
-       FREE_OP1();
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+       ZEND_VM_NEXT_OPCODE();
  }
  
 -ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMPVAR|UNUSED|CV)
 +ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, UNUSED|CLASS_FETCH|CONST|VAR, CONST|TMPVAR|UNUSED|CONSTRUCTOR|CV, NUM)
  {
        USE_OPLINE
        zval *function_name;
        call->prev_execute_data = EX(call);
        EX(call) = call;
  
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+       ZEND_VM_NEXT_OPCODE();
  }
  
 -ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST)
 +ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST, NUM)
  {
        USE_OPLINE
        zend_function *fbc;
@@@ -3458,15 -3394,23 +3462,29 @@@ ZEND_VM_C_LABEL(try_function_name)
                        }
                }
                zend_throw_error(NULL, "Function name must be a string");
 -              FREE_OP2();
 +              call = NULL;
 +      }
 +
-       FREE_OP2();
 +      if (UNEXPECTED(!call)) {
                HANDLE_EXCEPTION();
        }
  
 -      if ((OP2_TYPE & (IS_VAR|IS_TMP_VAR)) && UNEXPECTED(EG(exception))) {
 -              if (call_info & ZEND_CALL_RELEASE_THIS) {
 -                      zend_object_release(object);
 -              }
 -              if (fbc->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) {
 -                      zend_string_release(fbc->common.function_name);
 -                      zend_free_trampoline(fbc);
+       FREE_OP2();
 -      call = zend_vm_stack_push_call_frame(call_info,
 -              fbc, opline->extended_value, called_scope, object);
++      if (OP2_TYPE & (IS_VAR|IS_TMP_VAR)) {
++              if (UNEXPECTED(EG(exception))) {
++                      if (call) {
++                               if (call->func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) {
++                                      zend_string_release(call->func->common.function_name);
++                                      zend_free_trampoline(call->func);
++                              }
++                              zend_vm_stack_free_call_frame(call);
++                      }
++                      HANDLE_EXCEPTION();
+               }
++      } else if (UNEXPECTED(!call)) {
+               HANDLE_EXCEPTION();
+       }
++
        call->prev_execute_data = EX(call);
        EX(call) = call;
  
@@@ -3504,19 -3460,17 +3533,21 @@@ ZEND_VM_HANDLER(118, ZEND_INIT_USER_CAL
                        call_info |= ZEND_CALL_RELEASE_THIS;
                        GC_REFCOUNT(object)++; /* For $this pointer */
                }
-               if (error) {
-                       efree(error);
-                       /* This is the only soft error is_callable() can generate */
-                       zend_error(E_DEPRECATED,
-                               "Non-static method %s::%s() should not be called statically",
-                               ZSTR_VAL(func->common.scope->name), ZSTR_VAL(func->common.function_name));
-                       if (UNEXPECTED(EG(exception) != NULL)) {
-                               HANDLE_EXCEPTION();
+               FREE_OP2();
+               if ((OP2_TYPE & (IS_TMP_VAR|IS_VAR)) && UNEXPECTED(EG(exception))) {
+                       if (call_info & ZEND_CALL_CLOSURE) {
+                               zend_object_release((zend_object*)func->common.prototype);
                        }
+                       if (call_info & ZEND_CALL_RELEASE_THIS) {
+                               zend_object_release(object);
+                       }
+                       HANDLE_EXCEPTION();
                }
++
 +              if (EXPECTED(func->type == ZEND_USER_FUNCTION) && UNEXPECTED(!func->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&func->op_array);
 +              }
        } else {
                zend_internal_type_error(EX_USES_STRICT_TYPES(), "%s() expects parameter 1 to be a valid callback, %s", Z_STRVAL_P(EX_CONSTANT(opline->op1)), error);
                efree(error);
        call->prev_execute_data = EX(call);
        EX(call) = call;
  
-       FREE_OP2();
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+       ZEND_VM_NEXT_OPCODE();
  }
  
 -ZEND_VM_HANDLER(69, ZEND_INIT_NS_FCALL_BY_NAME, ANY, CONST)
 +ZEND_VM_HANDLER(69, ZEND_INIT_NS_FCALL_BY_NAME, ANY, CONST, NUM)
  {
        USE_OPLINE
        zval *func_name;
@@@ -4986,16 -4966,19 +5020,16 @@@ ZEND_VM_HANDLER(68, ZEND_NEW, UNUSED|CL
                        constructor,
                        opline->extended_value,
                        ce,
 -                      Z_OBJ(object_zval));
 -              call->prev_execute_data = EX(call);
 -              EX(call) = call;
 -
 -              if (EXPECTED(RETURN_VALUE_USED(opline))) {
 -                      ZVAL_COPY(EX_VAR(opline->result.var), &object_zval);
 -              }
 -
 -              ZEND_VM_NEXT_OPCODE();
 +                      Z_OBJ_P(result));
 +              Z_ADDREF_P(result);
        }
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +
 +      call->prev_execute_data = EX(call);
 +      EX(call) = call;
++      ZEND_VM_NEXT_OPCODE();
  }
  
 -ZEND_VM_HANDLER(110, ZEND_CLONE, CONST|TMPVAR|UNUSED|CV, ANY)
 +ZEND_VM_HANDLER(110, ZEND_CLONE, CONST|TMPVAR|UNUSED|THIS|CV, ANY)
  {
        USE_OPLINE
        zend_free_op free_op1;
index 4c0907254570fff3a490e12ccba139957308c923,2c90e0073ee28ee381cb2b93204ca7eb36e92ec7..a8a0466b5a5e70206fc49e4d236c7d2d89ebb142
@@@ -2179,6 -2106,18 +2179,21 @@@ try_function_name
                HANDLE_EXCEPTION();
        }
  
 -      if ((IS_CONST & (IS_VAR|IS_TMP_VAR)) && UNEXPECTED(EG(exception))) {
 -              if (call_info & ZEND_CALL_RELEASE_THIS) {
 -                      zend_object_release(object);
 -              }
 -              if (fbc->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) {
 -                      zend_string_release(fbc->common.function_name);
 -                      zend_free_trampoline(fbc);
++      if (IS_CONST & (IS_VAR|IS_TMP_VAR)) {
++              if (UNEXPECTED(EG(exception))) {
++                      if (call) {
++                               if (call->func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) {
++                                      zend_string_release(call->func->common.function_name);
++                                      zend_free_trampoline(call->func);
++                              }
++                              zend_vm_stack_free_call_frame(call);
++                      }
++                      HANDLE_EXCEPTION();
+               }
++      } else if (UNEXPECTED(!call)) {
+               HANDLE_EXCEPTION();
+       }
 -      call = zend_vm_stack_push_call_frame(call_info,
 -              fbc, opline->extended_value, called_scope, object);
++
        call->prev_execute_data = EX(call);
        EX(call) = call;
  
@@@ -2475,6 -2537,18 +2490,21 @@@ try_function_name
                HANDLE_EXCEPTION();
        }
  
 -      if ((IS_CV & (IS_VAR|IS_TMP_VAR)) && UNEXPECTED(EG(exception))) {
 -              if (call_info & ZEND_CALL_RELEASE_THIS) {
 -                      zend_object_release(object);
 -              }
 -              if (fbc->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) {
 -                      zend_string_release(fbc->common.function_name);
 -                      zend_free_trampoline(fbc);
++      if (IS_CV & (IS_VAR|IS_TMP_VAR)) {
++              if (UNEXPECTED(EG(exception))) {
++                      if (call) {
++                               if (call->func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) {
++                                      zend_string_release(call->func->common.function_name);
++                                      zend_free_trampoline(call->func);
++                              }
++                              zend_vm_stack_free_call_frame(call);
++                      }
++                      HANDLE_EXCEPTION();
+               }
++      } else if (UNEXPECTED(!call)) {
+               HANDLE_EXCEPTION();
+       }
 -      call = zend_vm_stack_push_call_frame(call_info,
 -              fbc, opline->extended_value, called_scope, object);
++
        call->prev_execute_data = EX(call);
        EX(call) = call;
  
@@@ -2552,15 -2797,23 +2582,29 @@@ try_function_name
                        }
                }
                zend_throw_error(NULL, "Function name must be a string");
 -              zval_ptr_dtor_nogc(free_op2);
 +              call = NULL;
 +      }
 +
-       zval_ptr_dtor_nogc(free_op2);
 +      if (UNEXPECTED(!call)) {
                HANDLE_EXCEPTION();
        }
  
 -      if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_TMP_VAR)) && UNEXPECTED(EG(exception))) {
 -              if (call_info & ZEND_CALL_RELEASE_THIS) {
 -                      zend_object_release(object);
 -              }
 -              if (fbc->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) {
 -                      zend_string_release(fbc->common.function_name);
 -                      zend_free_trampoline(fbc);
+       zval_ptr_dtor_nogc(free_op2);
 -      call = zend_vm_stack_push_call_frame(call_info,
 -              fbc, opline->extended_value, called_scope, object);
++      if ((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_TMP_VAR)) {
++              if (UNEXPECTED(EG(exception))) {
++                      if (call) {
++                               if (call->func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) {
++                                      zend_string_release(call->func->common.function_name);
++                                      zend_free_trampoline(call->func);
++                              }
++                              zend_vm_stack_free_call_frame(call);
++                      }
++                      HANDLE_EXCEPTION();
+               }
++      } else if (UNEXPECTED(!call)) {
+               HANDLE_EXCEPTION();
+       }
++
        call->prev_execute_data = EX(call);
        EX(call) = call;
  
@@@ -3217,13 -3384,16 +3261,13 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
                        constructor,
                        opline->extended_value,
                        ce,
 -                      Z_OBJ(object_zval));
 -              call->prev_execute_data = EX(call);
 -              EX(call) = call;
 -
 -              if (EXPECTED(RETURN_VALUE_USED(opline))) {
 -                      ZVAL_COPY(EX_VAR(opline->result.var), &object_zval);
 -              }
 -
 -              ZEND_VM_NEXT_OPCODE();
 +                      Z_OBJ_P(result));
 +              Z_ADDREF_P(result);
        }
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +
 +      call->prev_execute_data = EX(call);
 +      EX(call) = call;
++      ZEND_VM_NEXT_OPCODE();
  }
  
  static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CLONE_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@@ -5604,19 -5816,16 +5663,20 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
                        call_info |= ZEND_CALL_RELEASE_THIS;
                        GC_REFCOUNT(object)++; /* For $this pointer */
                }
-               if (error) {
-                       efree(error);
-                       /* This is the only soft error is_callable() can generate */
-                       zend_error(E_DEPRECATED,
-                               "Non-static method %s::%s() should not be called statically",
-                               ZSTR_VAL(func->common.scope->name), ZSTR_VAL(func->common.function_name));
-                       if (UNEXPECTED(EG(exception) != NULL)) {
-                               HANDLE_EXCEPTION();
+               if ((IS_CONST & (IS_TMP_VAR|IS_VAR)) && UNEXPECTED(EG(exception))) {
+                       if (call_info & ZEND_CALL_CLOSURE) {
+                               zend_object_release((zend_object*)func->common.prototype);
                        }
+                       if (call_info & ZEND_CALL_RELEASE_THIS) {
+                               zend_object_release(object);
+                       }
+                       HANDLE_EXCEPTION();
                }
++
 +              if (EXPECTED(func->type == ZEND_USER_FUNCTION) && UNEXPECTED(!func->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&func->op_array);
 +              }
        } else {
                zend_internal_type_error(EX_USES_STRICT_TYPES(), "%s() expects parameter 1 to be a valid callback, %s", Z_STRVAL_P(EX_CONSTANT(opline->op1)), error);
                efree(error);
@@@ -9499,19 -9587,16 +9578,20 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
                        call_info |= ZEND_CALL_RELEASE_THIS;
                        GC_REFCOUNT(object)++; /* For $this pointer */
                }
-               if (error) {
-                       efree(error);
-                       /* This is the only soft error is_callable() can generate */
-                       zend_error(E_DEPRECATED,
-                               "Non-static method %s::%s() should not be called statically",
-                               ZSTR_VAL(func->common.scope->name), ZSTR_VAL(func->common.function_name));
-                       if (UNEXPECTED(EG(exception) != NULL)) {
-                               HANDLE_EXCEPTION();
+               if ((IS_CV & (IS_TMP_VAR|IS_VAR)) && UNEXPECTED(EG(exception))) {
+                       if (call_info & ZEND_CALL_CLOSURE) {
+                               zend_object_release((zend_object*)func->common.prototype);
                        }
+                       if (call_info & ZEND_CALL_RELEASE_THIS) {
+                               zend_object_release(object);
+                       }
+                       HANDLE_EXCEPTION();
                }
++
 +              if (EXPECTED(func->type == ZEND_USER_FUNCTION) && UNEXPECTED(!func->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&func->op_array);
 +              }
        } else {
                zend_internal_type_error(EX_USES_STRICT_TYPES(), "%s() expects parameter 1 to be a valid callback, %s", Z_STRVAL_P(EX_CONSTANT(opline->op1)), error);
                efree(error);
@@@ -11458,19 -11437,17 +11557,21 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
                        call_info |= ZEND_CALL_RELEASE_THIS;
                        GC_REFCOUNT(object)++; /* For $this pointer */
                }
-               if (error) {
-                       efree(error);
-                       /* This is the only soft error is_callable() can generate */
-                       zend_error(E_DEPRECATED,
-                               "Non-static method %s::%s() should not be called statically",
-                               ZSTR_VAL(func->common.scope->name), ZSTR_VAL(func->common.function_name));
-                       if (UNEXPECTED(EG(exception) != NULL)) {
-                               HANDLE_EXCEPTION();
+               zval_ptr_dtor_nogc(free_op2);
+               if (((IS_TMP_VAR|IS_VAR) & (IS_TMP_VAR|IS_VAR)) && UNEXPECTED(EG(exception))) {
+                       if (call_info & ZEND_CALL_CLOSURE) {
+                               zend_object_release((zend_object*)func->common.prototype);
+                       }
+                       if (call_info & ZEND_CALL_RELEASE_THIS) {
+                               zend_object_release(object);
                        }
+                       HANDLE_EXCEPTION();
                }
++
 +              if (EXPECTED(func->type == ZEND_USER_FUNCTION) && UNEXPECTED(!func->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&func->op_array);
 +              }
        } else {
                zend_internal_type_error(EX_USES_STRICT_TYPES(), "%s() expects parameter 1 to be a valid callback, %s", Z_STRVAL_P(EX_CONSTANT(opline->op1)), error);
                efree(error);
@@@ -16217,13 -15556,16 +16321,13 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
                        constructor,
                        opline->extended_value,
                        ce,
 -                      Z_OBJ(object_zval));
 -              call->prev_execute_data = EX(call);
 -              EX(call) = call;
 -
 -              if (EXPECTED(RETURN_VALUE_USED(opline))) {
 -                      ZVAL_COPY(EX_VAR(opline->result.var), &object_zval);
 -              }
 -
 -              ZEND_VM_NEXT_OPCODE();
 +                      Z_OBJ_P(result));
 +              Z_ADDREF_P(result);
        }
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +
 +      call->prev_execute_data = EX(call);
 +      EX(call) = call;
++      ZEND_VM_NEXT_OPCODE();
  }
  
  static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CAST_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@@ -19545,660 -18153,67 +19649,660 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
  {
        USE_OPLINE
        zend_free_op free_op1;
 -      zval *container;
 -      zval *offset;
 +      zval *object_ptr;
 +
 +      zval *value;
 +      zval *variable_ptr;
 +      zval *dim;
  
        SAVE_OPLINE();
 -      container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1);
 -      if (IS_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) {
 -              zend_throw_error(NULL, "Using $this when not in object context");
 +      object_ptr = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1);
  
 -              HANDLE_EXCEPTION();
 -      }
 -      if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) {
 -              zend_throw_error(NULL, "Cannot unset string offsets");
 +      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +try_assign_dim_array:
 +              SEPARATE_ARRAY(object_ptr);
 +              if (IS_CONST == IS_UNUSED) {
 +                      variable_ptr = zend_hash_next_index_insert(Z_ARRVAL_P(object_ptr), &EG(uninitialized_zval));
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              zend_error(E_WARNING, "Cannot add element to the array as the next element is already occupied");
 +                              goto assign_dim_error;
 +                      }
 +              } else {
 +                      dim = EX_CONSTANT(opline->op2);
 +                      if (IS_CONST == IS_CONST) {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W_CONST(Z_ARRVAL_P(object_ptr), dim);
 +                      } else {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W(Z_ARRVAL_P(object_ptr), dim);
 +                      }
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              goto assign_dim_error;
 +                      }
 +              }
 +              value = _get_zval_ptr_cv_BP_VAR_R(execute_data, (opline+1)->op1.var);
 +              value = zend_assign_to_variable(variable_ptr, value, IS_CV);
 +              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +              }
 +      } else {
 +              if (EXPECTED(Z_ISREF_P(object_ptr))) {
 +                      object_ptr = Z_REFVAL_P(object_ptr);
 +                      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +                              goto try_assign_dim_array;
 +                      }
 +              }
 +              if (EXPECTED(Z_TYPE_P(object_ptr) == IS_OBJECT)) {
 +                      dim = EX_CONSTANT(opline->op2);
 +                      value = _get_zval_ptr_cv_BP_VAR_R(execute_data, (opline+1)->op1.var);
  
 -              HANDLE_EXCEPTION();
 -      }
 -      offset = EX_CONSTANT(opline->op2);
 +                      zend_assign_to_object_dim(object_ptr, dim, value);
  
 -      do {
 -              if (IS_VAR != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT)) {
 -                      if (Z_ISREF_P(container)) {
 -                              container = Z_REFVAL_P(container);
 -                              if (Z_TYPE_P(container) != IS_OBJECT) {
 -                                      break;
 -                              }
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) {
 +                              ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                      }
 +
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) == IS_STRING)) {
 +                      if (IS_CONST == IS_UNUSED) {
 +                              zend_throw_error(NULL, "[] operator not supported for strings");
 +
 +                              if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +                              HANDLE_EXCEPTION();
                        } else {
 -                              break;
 +                              dim = EX_CONSTANT(opline->op2);
 +                              value = _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, (opline+1)->op1.var);
 +                              zend_assign_to_string_offset(object_ptr, dim, value, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL));
 +
                        }
 -              }
 -              if (Z_OBJ_HT_P(container)->unset_property) {
 -                      Z_OBJ_HT_P(container)->unset_property(container, offset, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL));
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
 +                      ZVAL_NEW_ARR(object_ptr);
 +                      zend_hash_init(Z_ARRVAL_P(object_ptr), 8, NULL, ZVAL_PTR_DTOR, 0);
 +                      goto try_assign_dim_array;
                } else {
 -                      zend_error(E_NOTICE, "Trying to unset property of non-object");
 +                      if (IS_VAR != IS_VAR || EXPECTED(!Z_ISERROR_P(object_ptr))) {
 +                              zend_error(E_WARNING, "Cannot use a scalar value as an array");
 +                      }
 +                      dim = EX_CONSTANT(opline->op2);
 +assign_dim_error:
 +
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                              ZVAL_NULL(EX_VAR(opline->result.var));
 +                      }
                }
 -      } while (0);
 +      }
 +      if (IS_CONST != IS_UNUSED) {
  
 +      }
        if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 -      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +      /* assign_dim has two opcodes! */
 +      ZEND_VM_NEXT_OPCODE_EX(1, 2);
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_YIELD_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SPEC_VAR_CONST_RETVAL_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
        USE_OPLINE
 -
 -      zend_generator *generator = zend_get_running_generator(execute_data);
 +      zend_free_op free_op1;
 +      zval *value;
 +      zval *variable_ptr;
  
        SAVE_OPLINE();
 -      if (UNEXPECTED(generator->flags & ZEND_GENERATOR_FORCED_CLOSE)) {
 -              zend_throw_error(NULL, "Cannot yield from finally in a force-closed generator");
 +      value = EX_CONSTANT(opline->op2);
 +      variable_ptr = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1);
  
 -              zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
 -              HANDLE_EXCEPTION();
 +      if (IS_VAR == IS_VAR && UNEXPECTED(Z_ISERROR_P(variable_ptr))) {
 +
 +              if (UNEXPECTED(0)) {
 +                      ZVAL_NULL(EX_VAR(opline->result.var));
 +              }
 +      } else {
 +              value = zend_assign_to_variable(variable_ptr, value, IS_CONST);
 +              if (UNEXPECTED(0)) {
 +                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +              }
 +              if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +              /* zend_assign_to_variable() always takes care of op2, never free it! */
        }
  
 -      /* Destroy the previously yielded value */
 -      zval_ptr_dtor(&generator->value);
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
  
 -      /* Destroy the previously yielded key */
 -      zval_ptr_dtor(&generator->key);
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SPEC_VAR_CONST_RETVAL_USED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *value;
 +      zval *variable_ptr;
  
 -      /* Set the new yielded value */
 -      if (IS_VAR != IS_UNUSED) {
 +      SAVE_OPLINE();
 +      value = EX_CONSTANT(opline->op2);
 +      variable_ptr = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1);
 +
 +      if (IS_VAR == IS_VAR && UNEXPECTED(Z_ISERROR_P(variable_ptr))) {
 +
 +              if (UNEXPECTED(1)) {
 +                      ZVAL_NULL(EX_VAR(opline->result.var));
 +              }
 +      } else {
 +              value = zend_assign_to_variable(variable_ptr, value, IS_CONST);
 +              if (UNEXPECTED(1)) {
 +                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +              }
 +              if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +              /* zend_assign_to_variable() always takes care of op2, never free it! */
 +      }
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zval *function_name;
 +      zend_class_entry *ce;
 +      zend_object *object;
 +      zend_function *fbc;
 +      zend_execute_data *call;
 +
 +      SAVE_OPLINE();
 +
 +      if (IS_VAR == IS_CONST) {
 +              /* no function found. try a static method in class */
 +              ce = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)));
 +              if (UNEXPECTED(ce == NULL)) {
 +                      ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 +                      if (UNEXPECTED(ce == NULL)) {
 +                              ZEND_ASSERT(EG(exception));
 +                              HANDLE_EXCEPTION();
 +                      }
 +                      CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
 +              }
 +      } else if (IS_VAR == IS_UNUSED) {
 +              ce = zend_fetch_class(NULL, opline->op1.num);
 +              if (UNEXPECTED(ce == NULL)) {
 +                      ZEND_ASSERT(EG(exception));
 +
 +                      HANDLE_EXCEPTION();
 +              }
 +      } else {
 +              ce = Z_CE_P(EX_VAR(opline->op1.var));
 +      }
 +
 +      if (IS_VAR == IS_CONST &&
 +          IS_CONST == IS_CONST &&
 +          EXPECTED((fbc = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)))) != NULL)) {
 +              /* nothing to do */
 +      } else if (IS_VAR != IS_CONST &&
 +                 IS_CONST == IS_CONST &&
 +                 (fbc = CACHED_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce))) {
 +              /* do nothing */
 +      } else if (IS_CONST != IS_UNUSED) {
 +
 +
 +              function_name = EX_CONSTANT(opline->op2);
 +              if (IS_CONST != IS_CONST) {
 +                      if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
 +                              do {
 +                                      if (IS_CONST & (IS_VAR|IS_CV) && Z_ISREF_P(function_name)) {
 +                                              function_name = Z_REFVAL_P(function_name);
 +                                              if (EXPECTED(Z_TYPE_P(function_name) == IS_STRING)) {
 +                                                      break;
 +                                              }
 +                                      } else if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(function_name) == IS_UNDEF)) {
 +                                              GET_OP2_UNDEF_CV(function_name, BP_VAR_R);
 +                                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                                      HANDLE_EXCEPTION();
 +                                              }
 +                                      }
 +                                      zend_throw_error(NULL, "Function name must be a string");
 +
 +                                      HANDLE_EXCEPTION();
 +                              } while (0);
 +                      }
 +              }
 +
 +              if (ce->get_static_method) {
 +                      fbc = ce->get_static_method(ce, Z_STR_P(function_name));
 +              } else {
 +                      fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), ((IS_CONST == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL));
 +              }
 +              if (UNEXPECTED(fbc == NULL)) {
 +                      if (EXPECTED(!EG(exception))) {
 +                              zend_throw_error(NULL, "Call to undefined method %s::%s()", ZSTR_VAL(ce->name), Z_STRVAL_P(function_name));
 +                      }
 +
 +                      HANDLE_EXCEPTION();
 +              }
 +              if (IS_CONST == IS_CONST &&
 +                  EXPECTED(fbc->type <= ZEND_USER_FUNCTION) &&
 +                  EXPECTED(!(fbc->common.fn_flags & (ZEND_ACC_CALL_VIA_TRAMPOLINE|ZEND_ACC_NEVER_CACHE)))) {
 +                      if (IS_VAR == IS_CONST) {
 +                              CACHE_PTR(Z_CACHE_SLOT_P(function_name), fbc);
 +                      } else {
 +                              CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(function_name), ce, fbc);
 +                      }
 +              }
 +              if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&fbc->op_array);
 +              }
 +              if (IS_CONST != IS_CONST) {
 +
 +              }
 +      } else {
 +              if (UNEXPECTED(ce->constructor == NULL)) {
 +                      zend_throw_error(NULL, "Cannot call constructor");
 +                      HANDLE_EXCEPTION();
 +              }
 +              if (Z_TYPE(EX(This)) == IS_OBJECT && Z_OBJ(EX(This))->ce != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
 +                      zend_throw_error(NULL, "Cannot call private %s::__construct()", ZSTR_VAL(ce->name));
 +                      HANDLE_EXCEPTION();
 +              }
 +              fbc = ce->constructor;
 +              if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&fbc->op_array);
 +              }
 +      }
 +
 +      object = NULL;
 +      if (!(fbc->common.fn_flags & ZEND_ACC_STATIC)) {
 +              if (Z_TYPE(EX(This)) == IS_OBJECT && instanceof_function(Z_OBJCE(EX(This)), ce)) {
 +                      object = Z_OBJ(EX(This));
 +                      ce = object->ce;
 +              } else {
 +                      if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
 +                              /* Allowed for PHP 4 compatibility. */
 +                              zend_error(
 +                                      E_DEPRECATED,
 +                                      "Non-static method %s::%s() should not be called statically",
 +                                      ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
 +                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                      HANDLE_EXCEPTION();
 +                              }
 +                      } else {
 +                              /* An internal function assumes $this is present and won't check that.
 +                               * So PHP would crash by allowing the call. */
 +                              zend_throw_error(
 +                                      zend_ce_error,
 +                                      "Non-static method %s::%s() cannot be called statically",
 +                                      ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
 +                              HANDLE_EXCEPTION();
 +                      }
 +              }
 +      }
 +
 +      if (IS_VAR == IS_UNUSED) {
 +              /* previous opcode is ZEND_FETCH_CLASS */
 +              if ((opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_PARENT ||
 +                  (opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_SELF) {
 +                      if (Z_TYPE(EX(This)) == IS_OBJECT) {
 +                              ce = Z_OBJCE(EX(This));
 +                      } else {
 +                              ce = Z_CE(EX(This));
 +                      }
 +              }
 +      }
 +
 +      call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION,
 +              fbc, opline->extended_value, ce, object);
 +      call->prev_execute_data = EX(call);
 +      EX(call) = call;
 +
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
++      ZEND_VM_NEXT_OPCODE();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      zend_class_entry *ce, *scope;
 +      zend_class_constant *c;
 +      zval *value;
 +      USE_OPLINE
 +
 +      SAVE_OPLINE();
 +
 +      do {
 +              if (IS_VAR == IS_CONST) {
 +                      if (EXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2))))) {
 +                              value = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)));
 +#ifdef ZTS
 +                              ce = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)));
 +#endif
 +                              break;
 +                      } else if (EXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1))))) {
 +                              ce = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)));
 +                      } else {
 +                              ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
 +                              if (UNEXPECTED(ce == NULL)) {
 +                                      ZEND_ASSERT(EG(exception));
 +                                      HANDLE_EXCEPTION();
 +                              }
 +                              CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
 +                      }
 +              } else {
 +                      if (IS_VAR == IS_UNUSED) {
 +                              ce = zend_fetch_class(NULL, opline->op1.num);
 +                              if (UNEXPECTED(ce == NULL)) {
 +                                      ZEND_ASSERT(EG(exception));
 +                                      HANDLE_EXCEPTION();
 +                              }
 +                      } else {
 +                              ce = Z_CE_P(EX_VAR(opline->op1.var));
 +                      }
 +                      if ((value = CACHED_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce)) != NULL) {
 +                              break;
 +                      }
 +              }
 +
 +              if (EXPECTED((c = zend_hash_find_ptr(&ce->constants_table, Z_STR_P(EX_CONSTANT(opline->op2)))) != NULL)) {
 +                      scope = EX(func)->op_array.scope;
 +                      if (!zend_verify_const_access(c, scope)) {
 +                              zend_throw_error(NULL, "Cannot access %s const %s::%s", zend_visibility_string(Z_ACCESS_FLAGS(c->value)), ZSTR_VAL(ce->name), Z_STRVAL_P(EX_CONSTANT(opline->op2)));
 +                              HANDLE_EXCEPTION();
 +                      }
 +                      value = &c->value;
 +                      if (Z_CONSTANT_P(value)) {
 +                              zval_update_constant_ex(value, ce);
 +                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                      HANDLE_EXCEPTION();
 +                              }
 +                      }
 +                      if (IS_VAR == IS_CONST) {
 +                              CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), value);
 +                      } else {
 +                              CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce, value);
 +                      }
 +              } else {
 +                      zend_throw_error(NULL, "Undefined class constant '%s'", Z_STRVAL_P(EX_CONSTANT(opline->op2)));
 +                      HANDLE_EXCEPTION();
 +              }
 +      } while (0);
 +
 +#ifdef ZTS
 +      if (ce->type == ZEND_INTERNAL_CLASS) {
 +              ZVAL_DUP(EX_VAR(opline->result.var), value);
 +      } else {
 +              ZVAL_COPY(EX_VAR(opline->result.var), value);
 +      }
 +#else
 +      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +#endif
 +
 +      ZEND_VM_NEXT_OPCODE();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *expr_ptr, new_expr;
 +
 +      SAVE_OPLINE();
 +      if ((IS_VAR == IS_VAR || IS_VAR == IS_CV) &&
 +          UNEXPECTED(opline->extended_value & ZEND_ARRAY_ELEMENT_REF)) {
 +              expr_ptr = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1);
 +              ZVAL_MAKE_REF(expr_ptr);
 +              Z_ADDREF_P(expr_ptr);
 +              if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +      } else {
 +              expr_ptr = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +              if (IS_VAR == IS_TMP_VAR) {
 +                      /* pass */
 +              } else if (IS_VAR == IS_CONST) {
 +                      if (Z_REFCOUNTED_P(expr_ptr)) {
 +                              Z_ADDREF_P(expr_ptr);
 +                      }
 +              } else if (IS_VAR == IS_CV) {
 +                      ZVAL_DEREF(expr_ptr);
 +                      if (Z_REFCOUNTED_P(expr_ptr)) {
 +                              Z_ADDREF_P(expr_ptr);
 +                      }
 +              } else /* if (IS_VAR == IS_VAR) */ {
 +                      if (UNEXPECTED(Z_ISREF_P(expr_ptr))) {
 +                              zend_refcounted *ref = Z_COUNTED_P(expr_ptr);
 +
 +                              expr_ptr = Z_REFVAL_P(expr_ptr);
 +                              if (UNEXPECTED(--GC_REFCOUNT(ref) == 0)) {
 +                                      ZVAL_COPY_VALUE(&new_expr, expr_ptr);
 +                                      expr_ptr = &new_expr;
 +                                      efree_size(ref, sizeof(zend_reference));
 +                              } else if (Z_OPT_REFCOUNTED_P(expr_ptr)) {
 +                                      Z_ADDREF_P(expr_ptr);
 +                              }
 +                      }
 +              }
 +      }
 +
 +      if (IS_CONST != IS_UNUSED) {
 +
 +              zval *offset = EX_CONSTANT(opline->op2);
 +              zend_string *str;
 +              zend_ulong hval;
 +
 +add_again:
 +              if (EXPECTED(Z_TYPE_P(offset) == IS_STRING)) {
 +                      str = Z_STR_P(offset);
 +                      if (IS_CONST != IS_CONST) {
 +                              if (ZEND_HANDLE_NUMERIC(str, hval)) {
 +                                      goto num_index;
 +                              }
 +                      }
 +str_index:
 +                      zend_hash_update(Z_ARRVAL_P(EX_VAR(opline->result.var)), str, expr_ptr);
 +              } else if (EXPECTED(Z_TYPE_P(offset) == IS_LONG)) {
 +                      hval = Z_LVAL_P(offset);
 +num_index:
 +                      zend_hash_index_update(Z_ARRVAL_P(EX_VAR(opline->result.var)), hval, expr_ptr);
 +              } else if ((IS_CONST & (IS_VAR|IS_CV)) && EXPECTED(Z_TYPE_P(offset) == IS_REFERENCE)) {
 +                      offset = Z_REFVAL_P(offset);
 +                      goto add_again;
 +              } else if (Z_TYPE_P(offset) == IS_NULL) {
 +                      str = ZSTR_EMPTY_ALLOC();
 +                      goto str_index;
 +              } else if (Z_TYPE_P(offset) == IS_DOUBLE) {
 +                      hval = zend_dval_to_lval(Z_DVAL_P(offset));
 +                      goto num_index;
 +              } else if (Z_TYPE_P(offset) == IS_FALSE) {
 +                      hval = 0;
 +                      goto num_index;
 +              } else if (Z_TYPE_P(offset) == IS_TRUE) {
 +                      hval = 1;
 +                      goto num_index;
 +              } else if (IS_CONST == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
 +                      GET_OP2_UNDEF_CV(offset, BP_VAR_R);
 +                      str = ZSTR_EMPTY_ALLOC();
 +                      goto str_index;
 +              } else {
 +                      zend_error(E_WARNING, "Illegal offset type");
 +                      zval_ptr_dtor(expr_ptr);
 +              }
 +
 +      } else {
 +              if (!zend_hash_next_index_insert(Z_ARRVAL_P(EX_VAR(opline->result.var)), expr_ptr)) {
 +                      zend_error(E_WARNING, "Cannot add element to the array as the next element is already occupied");
 +                      zval_ptr_dtor(expr_ptr);
 +              }
 +      }
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      zval *array;
 +      uint32_t size;
 +      USE_OPLINE
 +
 +      array = EX_VAR(opline->result.var);
 +      if (IS_VAR != IS_UNUSED) {
 +              size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
 +      } else {
 +              size = 0;
 +      }
 +      ZVAL_NEW_ARR(array);
 +      zend_hash_init(Z_ARRVAL_P(array), size, NULL, ZVAL_PTR_DTOR, 0);
 +
 +      if (IS_VAR != IS_UNUSED) {
 +              /* Explicitly initialize array as not-packed if flag is set */
 +              if (opline->extended_value & ZEND_ARRAY_NOT_PACKED) {
 +                      zend_hash_real_init(Z_ARRVAL_P(array), 0);
 +              }
 +      }
 +
 +      if (IS_VAR == IS_UNUSED) {
 +              ZEND_VM_NEXT_OPCODE();
 +#if 0 || (IS_VAR != IS_UNUSED)
 +      } else {
 +              ZEND_VM_TAIL_CALL(ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU));
 +#endif
 +      }
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *container;
 +      zval *offset;
 +      zend_ulong hval;
 +      zend_string *key;
 +
 +      SAVE_OPLINE();
 +      container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1);
 +      offset = EX_CONSTANT(opline->op2);
 +
 +      do {
 +              if (EXPECTED(Z_TYPE_P(container) == IS_ARRAY)) {
 +                      HashTable *ht;
 +
 +unset_dim_array:
 +                      SEPARATE_ARRAY(container);
 +                      ht = Z_ARRVAL_P(container);
 +offset_again:
 +                      if (EXPECTED(Z_TYPE_P(offset) == IS_STRING)) {
 +                              key = Z_STR_P(offset);
 +                              if (IS_CONST != IS_CONST) {
 +                                      if (ZEND_HANDLE_NUMERIC(key, hval)) {
 +                                              goto num_index_dim;
 +                                      }
 +                              }
 +str_index_dim:
 +                              if (ht == &EG(symbol_table)) {
 +                                      zend_delete_global_variable(key);
 +                              } else {
 +                                      zend_hash_del(ht, key);
 +                              }
 +                      } else if (EXPECTED(Z_TYPE_P(offset) == IS_LONG)) {
 +                              hval = Z_LVAL_P(offset);
 +num_index_dim:
 +                              zend_hash_index_del(ht, hval);
 +                      } else if ((IS_CONST & (IS_VAR|IS_CV)) && EXPECTED(Z_TYPE_P(offset) == IS_REFERENCE)) {
 +                              offset = Z_REFVAL_P(offset);
 +                              goto offset_again;
 +                      } else if (Z_TYPE_P(offset) == IS_DOUBLE) {
 +                              hval = zend_dval_to_lval(Z_DVAL_P(offset));
 +                              goto num_index_dim;
 +                      } else if (Z_TYPE_P(offset) == IS_NULL) {
 +                              key = ZSTR_EMPTY_ALLOC();
 +                              goto str_index_dim;
 +                      } else if (Z_TYPE_P(offset) == IS_FALSE) {
 +                              hval = 0;
 +                              goto num_index_dim;
 +                      } else if (Z_TYPE_P(offset) == IS_TRUE) {
 +                              hval = 1;
 +                              goto num_index_dim;
 +                      } else if (Z_TYPE_P(offset) == IS_RESOURCE) {
 +                              hval = Z_RES_HANDLE_P(offset);
 +                              goto num_index_dim;
 +                      } else if (IS_CONST == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
 +                              GET_OP2_UNDEF_CV(offset, BP_VAR_R);
 +                              key = ZSTR_EMPTY_ALLOC();
 +                              goto str_index_dim;
 +                      } else {
 +                              zend_error(E_WARNING, "Illegal offset type in unset");
 +                      }
 +                      break;
 +              } else if (Z_ISREF_P(container)) {
 +                      container = Z_REFVAL_P(container);
 +                      if (EXPECTED(Z_TYPE_P(container) == IS_ARRAY)) {
 +                              goto unset_dim_array;
 +                      }
 +              }
 +              if (IS_VAR == IS_CV && UNEXPECTED(Z_TYPE_P(container) == IS_UNDEF)) {
 +                      container = GET_OP1_UNDEF_CV(container, BP_VAR_R);
 +              }
 +              if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 +                      offset = GET_OP2_UNDEF_CV(offset, BP_VAR_R);
 +              }
 +              if (EXPECTED(Z_TYPE_P(container) == IS_OBJECT)) {
 +                      if (UNEXPECTED(Z_OBJ_HT_P(container)->unset_dimension == NULL)) {
 +                              zend_throw_error(NULL, "Cannot use object as array");
 +                      } else {
 +                              Z_OBJ_HT_P(container)->unset_dimension(container, offset);
 +                      }
 +              } else if (IS_VAR != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
 +                      zend_throw_error(NULL, "Cannot unset string offsets");
 +              }
 +      } while (0);
 +
 +      if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *container;
 +      zval *offset;
 +
 +      SAVE_OPLINE();
 +      container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1);
 +      if (IS_VAR == IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +
 +              HANDLE_EXCEPTION();
 +      }
 +      offset = EX_CONSTANT(opline->op2);
 +
 +      do {
 +              if (IS_VAR != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT)) {
 +                      if (Z_ISREF_P(container)) {
 +                              container = Z_REFVAL_P(container);
 +                              if (Z_TYPE_P(container) != IS_OBJECT) {
 +                                      break;
 +                              }
 +                      } else {
 +                              break;
 +                      }
 +              }
 +              if (Z_OBJ_HT_P(container)->unset_property) {
 +                      Z_OBJ_HT_P(container)->unset_property(container, offset, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL));
 +              } else {
 +                      zend_error(E_NOTICE, "Trying to unset property of non-object");
 +              }
 +      } while (0);
 +
 +      if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_YIELD_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +
 +      zend_generator *generator = zend_get_running_generator(execute_data);
 +
 +      SAVE_OPLINE();
 +      if (UNEXPECTED(generator->flags & ZEND_GENERATOR_FORCED_CLOSE)) {
 +              zend_throw_error(NULL, "Cannot yield from finally in a force-closed generator");
 +
 +              zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
 +              HANDLE_EXCEPTION();
 +      }
 +
 +      /* Destroy the previously yielded value */
 +      zval_ptr_dtor(&generator->value);
 +
 +      /* Destroy the previously yielded key */
 +      zval_ptr_dtor(&generator->key);
 +
 +      /* Set the new yielded value */
 +      if (IS_VAR != IS_UNUSED) {
                zend_free_op free_op1;
  
                if (UNEXPECTED(EX(func)->op_array.fn_flags & ZEND_ACC_RETURN_REFERENCE)) {
@@@ -24134,600 -21143,10 +24238,600 @@@ assign_dim_error
                        }
                }
        }
 -
        if (IS_CV != IS_UNUSED) {
  
 -              zval *offset = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
 +      }
 +      if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +      /* assign_dim has two opcodes! */
 +      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_VAR_CV_OP_DATA_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *object_ptr;
 +      zend_free_op free_op_data;
 +      zval *value;
 +      zval *variable_ptr;
 +      zval *dim;
 +
 +      SAVE_OPLINE();
 +      object_ptr = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1);
 +
 +      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +try_assign_dim_array:
 +              SEPARATE_ARRAY(object_ptr);
 +              if (IS_CV == IS_UNUSED) {
 +                      variable_ptr = zend_hash_next_index_insert(Z_ARRVAL_P(object_ptr), &EG(uninitialized_zval));
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              zend_error(E_WARNING, "Cannot add element to the array as the next element is already occupied");
 +                              goto assign_dim_error;
 +                      }
 +              } else {
 +                      dim = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
 +                      if (IS_CV == IS_CONST) {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W_CONST(Z_ARRVAL_P(object_ptr), dim);
 +                      } else {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W(Z_ARRVAL_P(object_ptr), dim);
 +                      }
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              goto assign_dim_error;
 +                      }
 +              }
 +              value = _get_zval_ptr_tmp((opline+1)->op1.var, execute_data, &free_op_data);
 +              value = zend_assign_to_variable(variable_ptr, value, IS_TMP_VAR);
 +              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +              }
 +      } else {
 +              if (EXPECTED(Z_ISREF_P(object_ptr))) {
 +                      object_ptr = Z_REFVAL_P(object_ptr);
 +                      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +                              goto try_assign_dim_array;
 +                      }
 +              }
 +              if (EXPECTED(Z_TYPE_P(object_ptr) == IS_OBJECT)) {
 +                      dim = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var);
 +                      value = _get_zval_ptr_tmp((opline+1)->op1.var, execute_data, &free_op_data);
 +
 +                      zend_assign_to_object_dim(object_ptr, dim, value);
 +
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) {
 +                              ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                      }
 +
 +                      zval_ptr_dtor_nogc(free_op_data);
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) == IS_STRING)) {
 +                      if (IS_CV == IS_UNUSED) {
 +                              zend_throw_error(NULL, "[] operator not supported for strings");
 +                              zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
 +                              if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +                              HANDLE_EXCEPTION();
 +                      } else {
 +                              dim = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var);
 +                              value = _get_zval_ptr_tmp((opline+1)->op1.var, execute_data, &free_op_data);
 +                              zend_assign_to_string_offset(object_ptr, dim, value, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL));
 +                              zval_ptr_dtor_nogc(free_op_data);
 +                      }
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
 +                      ZVAL_NEW_ARR(object_ptr);
 +                      zend_hash_init(Z_ARRVAL_P(object_ptr), 8, NULL, ZVAL_PTR_DTOR, 0);
 +                      goto try_assign_dim_array;
 +              } else {
 +                      if (IS_VAR != IS_VAR || EXPECTED(!Z_ISERROR_P(object_ptr))) {
 +                              zend_error(E_WARNING, "Cannot use a scalar value as an array");
 +                      }
 +                      dim = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var);
 +assign_dim_error:
 +                      zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                              ZVAL_NULL(EX_VAR(opline->result.var));
 +                      }
 +              }
 +      }
 +      if (IS_CV != IS_UNUSED) {
 +
 +      }
 +      if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +      /* assign_dim has two opcodes! */
 +      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_VAR_CV_OP_DATA_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *object_ptr;
 +      zend_free_op free_op_data;
 +      zval *value;
 +      zval *variable_ptr;
 +      zval *dim;
 +
 +      SAVE_OPLINE();
 +      object_ptr = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1);
 +
 +      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +try_assign_dim_array:
 +              SEPARATE_ARRAY(object_ptr);
 +              if (IS_CV == IS_UNUSED) {
 +                      variable_ptr = zend_hash_next_index_insert(Z_ARRVAL_P(object_ptr), &EG(uninitialized_zval));
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              zend_error(E_WARNING, "Cannot add element to the array as the next element is already occupied");
 +                              goto assign_dim_error;
 +                      }
 +              } else {
 +                      dim = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
 +                      if (IS_CV == IS_CONST) {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W_CONST(Z_ARRVAL_P(object_ptr), dim);
 +                      } else {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W(Z_ARRVAL_P(object_ptr), dim);
 +                      }
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              goto assign_dim_error;
 +                      }
 +              }
 +              value = _get_zval_ptr_var((opline+1)->op1.var, execute_data, &free_op_data);
 +              value = zend_assign_to_variable(variable_ptr, value, IS_VAR);
 +              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +              }
 +      } else {
 +              if (EXPECTED(Z_ISREF_P(object_ptr))) {
 +                      object_ptr = Z_REFVAL_P(object_ptr);
 +                      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +                              goto try_assign_dim_array;
 +                      }
 +              }
 +              if (EXPECTED(Z_TYPE_P(object_ptr) == IS_OBJECT)) {
 +                      dim = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var);
 +                      value = _get_zval_ptr_var((opline+1)->op1.var, execute_data, &free_op_data);
 +
 +                      zend_assign_to_object_dim(object_ptr, dim, value);
 +
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) {
 +                              ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                      }
 +
 +                      zval_ptr_dtor_nogc(free_op_data);
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) == IS_STRING)) {
 +                      if (IS_CV == IS_UNUSED) {
 +                              zend_throw_error(NULL, "[] operator not supported for strings");
 +                              zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
 +                              if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +                              HANDLE_EXCEPTION();
 +                      } else {
 +                              dim = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var);
 +                              value = _get_zval_ptr_var_deref((opline+1)->op1.var, execute_data, &free_op_data);
 +                              zend_assign_to_string_offset(object_ptr, dim, value, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL));
 +                              zval_ptr_dtor_nogc(free_op_data);
 +                      }
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
 +                      ZVAL_NEW_ARR(object_ptr);
 +                      zend_hash_init(Z_ARRVAL_P(object_ptr), 8, NULL, ZVAL_PTR_DTOR, 0);
 +                      goto try_assign_dim_array;
 +              } else {
 +                      if (IS_VAR != IS_VAR || EXPECTED(!Z_ISERROR_P(object_ptr))) {
 +                              zend_error(E_WARNING, "Cannot use a scalar value as an array");
 +                      }
 +                      dim = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var);
 +assign_dim_error:
 +                      zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                              ZVAL_NULL(EX_VAR(opline->result.var));
 +                      }
 +              }
 +      }
 +      if (IS_CV != IS_UNUSED) {
 +
 +      }
 +      if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +      /* assign_dim has two opcodes! */
 +      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_VAR_CV_OP_DATA_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *object_ptr;
 +
 +      zval *value;
 +      zval *variable_ptr;
 +      zval *dim;
 +
 +      SAVE_OPLINE();
 +      object_ptr = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1);
 +
 +      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +try_assign_dim_array:
 +              SEPARATE_ARRAY(object_ptr);
 +              if (IS_CV == IS_UNUSED) {
 +                      variable_ptr = zend_hash_next_index_insert(Z_ARRVAL_P(object_ptr), &EG(uninitialized_zval));
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              zend_error(E_WARNING, "Cannot add element to the array as the next element is already occupied");
 +                              goto assign_dim_error;
 +                      }
 +              } else {
 +                      dim = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
 +                      if (IS_CV == IS_CONST) {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W_CONST(Z_ARRVAL_P(object_ptr), dim);
 +                      } else {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W(Z_ARRVAL_P(object_ptr), dim);
 +                      }
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              goto assign_dim_error;
 +                      }
 +              }
 +              value = _get_zval_ptr_cv_BP_VAR_R(execute_data, (opline+1)->op1.var);
 +              value = zend_assign_to_variable(variable_ptr, value, IS_CV);
 +              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +              }
 +      } else {
 +              if (EXPECTED(Z_ISREF_P(object_ptr))) {
 +                      object_ptr = Z_REFVAL_P(object_ptr);
 +                      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +                              goto try_assign_dim_array;
 +                      }
 +              }
 +              if (EXPECTED(Z_TYPE_P(object_ptr) == IS_OBJECT)) {
 +                      dim = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var);
 +                      value = _get_zval_ptr_cv_BP_VAR_R(execute_data, (opline+1)->op1.var);
 +
 +                      zend_assign_to_object_dim(object_ptr, dim, value);
 +
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) {
 +                              ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                      }
 +
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) == IS_STRING)) {
 +                      if (IS_CV == IS_UNUSED) {
 +                              zend_throw_error(NULL, "[] operator not supported for strings");
 +
 +                              if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +                              HANDLE_EXCEPTION();
 +                      } else {
 +                              dim = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var);
 +                              value = _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, (opline+1)->op1.var);
 +                              zend_assign_to_string_offset(object_ptr, dim, value, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL));
 +
 +                      }
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
 +                      ZVAL_NEW_ARR(object_ptr);
 +                      zend_hash_init(Z_ARRVAL_P(object_ptr), 8, NULL, ZVAL_PTR_DTOR, 0);
 +                      goto try_assign_dim_array;
 +              } else {
 +                      if (IS_VAR != IS_VAR || EXPECTED(!Z_ISERROR_P(object_ptr))) {
 +                              zend_error(E_WARNING, "Cannot use a scalar value as an array");
 +                      }
 +                      dim = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var);
 +assign_dim_error:
 +
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                              ZVAL_NULL(EX_VAR(opline->result.var));
 +                      }
 +              }
 +      }
 +      if (IS_CV != IS_UNUSED) {
 +
 +      }
 +      if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +      /* assign_dim has two opcodes! */
 +      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SPEC_VAR_CV_RETVAL_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *value;
 +      zval *variable_ptr;
 +
 +      SAVE_OPLINE();
 +      value = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var);
 +      variable_ptr = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1);
 +
 +      if (IS_VAR == IS_VAR && UNEXPECTED(Z_ISERROR_P(variable_ptr))) {
 +
 +              if (UNEXPECTED(0)) {
 +                      ZVAL_NULL(EX_VAR(opline->result.var));
 +              }
 +      } else {
 +              value = zend_assign_to_variable(variable_ptr, value, IS_CV);
 +              if (UNEXPECTED(0)) {
 +                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +              }
 +              if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +              /* zend_assign_to_variable() always takes care of op2, never free it! */
 +      }
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SPEC_VAR_CV_RETVAL_USED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *value;
 +      zval *variable_ptr;
 +
 +      SAVE_OPLINE();
 +      value = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var);
 +      variable_ptr = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1);
 +
 +      if (IS_VAR == IS_VAR && UNEXPECTED(Z_ISERROR_P(variable_ptr))) {
 +
 +              if (UNEXPECTED(1)) {
 +                      ZVAL_NULL(EX_VAR(opline->result.var));
 +              }
 +      } else {
 +              value = zend_assign_to_variable(variable_ptr, value, IS_CV);
 +              if (UNEXPECTED(1)) {
 +                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +              }
 +              if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +              /* zend_assign_to_variable() always takes care of op2, never free it! */
 +      }
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *variable_ptr;
 +      zval *value_ptr;
 +
 +      SAVE_OPLINE();
 +      value_ptr = _get_zval_ptr_cv_BP_VAR_W(execute_data, opline->op2.var);
 +      variable_ptr = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1);
 +
 +      if (IS_VAR == IS_VAR &&
 +          UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) &&
 +          UNEXPECTED(!Z_ISREF_P(EX_VAR(opline->op1.var))) &&
 +          UNEXPECTED(!Z_ISERROR_P(EX_VAR(opline->op1.var)))) {
 +
 +              zend_throw_error(NULL, "Cannot assign by reference to overloaded object");
 +              if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +
 +              HANDLE_EXCEPTION();
 +
 +      } else if (IS_CV == IS_VAR &&
 +                 opline->extended_value == ZEND_RETURNS_FUNCTION &&
 +                         UNEXPECTED(!Z_ISREF_P(value_ptr))) {
 +              zend_error(E_NOTICE, "Only variables should be assigned by reference");
 +              if (UNEXPECTED(EG(exception) != NULL)) {
 +
 +                      HANDLE_EXCEPTION();
 +              }
 +
 +              value_ptr = zend_assign_to_variable(variable_ptr, value_ptr, IS_CV);
 +              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                      ZVAL_COPY(EX_VAR(opline->result.var), value_ptr);
 +              }
 +              /* zend_assign_to_variable() always takes care of op2, never free it! */
 +
 +      } else {
 +
 +              if ((IS_VAR == IS_VAR && UNEXPECTED(Z_ISERROR_P(variable_ptr))) ||
 +                  (IS_CV == IS_VAR && UNEXPECTED(Z_ISERROR_P(value_ptr)))) {
 +                      variable_ptr = &EG(uninitialized_zval);
 +              } else {
 +                      zend_assign_to_variable_reference(variable_ptr, value_ptr);
 +              }
 +
 +              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                      ZVAL_COPY(EX_VAR(opline->result.var), variable_ptr);
 +              }
 +
 +      }
 +
 +      if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zval *function_name;
 +      zend_class_entry *ce;
 +      zend_object *object;
 +      zend_function *fbc;
 +      zend_execute_data *call;
 +
 +      SAVE_OPLINE();
 +
 +      if (IS_VAR == IS_CONST) {
 +              /* no function found. try a static method in class */
 +              ce = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)));
 +              if (UNEXPECTED(ce == NULL)) {
 +                      ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 +                      if (UNEXPECTED(ce == NULL)) {
 +                              ZEND_ASSERT(EG(exception));
 +                              HANDLE_EXCEPTION();
 +                      }
 +                      CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
 +              }
 +      } else if (IS_VAR == IS_UNUSED) {
 +              ce = zend_fetch_class(NULL, opline->op1.num);
 +              if (UNEXPECTED(ce == NULL)) {
 +                      ZEND_ASSERT(EG(exception));
 +
 +                      HANDLE_EXCEPTION();
 +              }
 +      } else {
 +              ce = Z_CE_P(EX_VAR(opline->op1.var));
 +      }
 +
 +      if (IS_VAR == IS_CONST &&
 +          IS_CV == IS_CONST &&
 +          EXPECTED((fbc = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)))) != NULL)) {
 +              /* nothing to do */
 +      } else if (IS_VAR != IS_CONST &&
 +                 IS_CV == IS_CONST &&
 +                 (fbc = CACHED_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce))) {
 +              /* do nothing */
 +      } else if (IS_CV != IS_UNUSED) {
 +
 +
 +              function_name = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
 +              if (IS_CV != IS_CONST) {
 +                      if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
 +                              do {
 +                                      if (IS_CV & (IS_VAR|IS_CV) && Z_ISREF_P(function_name)) {
 +                                              function_name = Z_REFVAL_P(function_name);
 +                                              if (EXPECTED(Z_TYPE_P(function_name) == IS_STRING)) {
 +                                                      break;
 +                                              }
 +                                      } else if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(function_name) == IS_UNDEF)) {
 +                                              GET_OP2_UNDEF_CV(function_name, BP_VAR_R);
 +                                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                                      HANDLE_EXCEPTION();
 +                                              }
 +                                      }
 +                                      zend_throw_error(NULL, "Function name must be a string");
 +
 +                                      HANDLE_EXCEPTION();
 +                              } while (0);
 +                      }
 +              }
 +
 +              if (ce->get_static_method) {
 +                      fbc = ce->get_static_method(ce, Z_STR_P(function_name));
 +              } else {
 +                      fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), ((IS_CV == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL));
 +              }
 +              if (UNEXPECTED(fbc == NULL)) {
 +                      if (EXPECTED(!EG(exception))) {
 +                              zend_throw_error(NULL, "Call to undefined method %s::%s()", ZSTR_VAL(ce->name), Z_STRVAL_P(function_name));
 +                      }
 +
 +                      HANDLE_EXCEPTION();
 +              }
 +              if (IS_CV == IS_CONST &&
 +                  EXPECTED(fbc->type <= ZEND_USER_FUNCTION) &&
 +                  EXPECTED(!(fbc->common.fn_flags & (ZEND_ACC_CALL_VIA_TRAMPOLINE|ZEND_ACC_NEVER_CACHE)))) {
 +                      if (IS_VAR == IS_CONST) {
 +                              CACHE_PTR(Z_CACHE_SLOT_P(function_name), fbc);
 +                      } else {
 +                              CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(function_name), ce, fbc);
 +                      }
 +              }
 +              if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&fbc->op_array);
 +              }
 +              if (IS_CV != IS_CONST) {
 +
 +              }
 +      } else {
 +              if (UNEXPECTED(ce->constructor == NULL)) {
 +                      zend_throw_error(NULL, "Cannot call constructor");
 +                      HANDLE_EXCEPTION();
 +              }
 +              if (Z_TYPE(EX(This)) == IS_OBJECT && Z_OBJ(EX(This))->ce != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
 +                      zend_throw_error(NULL, "Cannot call private %s::__construct()", ZSTR_VAL(ce->name));
 +                      HANDLE_EXCEPTION();
 +              }
 +              fbc = ce->constructor;
 +              if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&fbc->op_array);
 +              }
 +      }
 +
 +      object = NULL;
 +      if (!(fbc->common.fn_flags & ZEND_ACC_STATIC)) {
 +              if (Z_TYPE(EX(This)) == IS_OBJECT && instanceof_function(Z_OBJCE(EX(This)), ce)) {
 +                      object = Z_OBJ(EX(This));
 +                      ce = object->ce;
 +              } else {
 +                      if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
 +                              /* Allowed for PHP 4 compatibility. */
 +                              zend_error(
 +                                      E_DEPRECATED,
 +                                      "Non-static method %s::%s() should not be called statically",
 +                                      ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
 +                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                      HANDLE_EXCEPTION();
 +                              }
 +                      } else {
 +                              /* An internal function assumes $this is present and won't check that.
 +                               * So PHP would crash by allowing the call. */
 +                              zend_throw_error(
 +                                      zend_ce_error,
 +                                      "Non-static method %s::%s() cannot be called statically",
 +                                      ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
 +                              HANDLE_EXCEPTION();
 +                      }
 +              }
 +      }
 +
 +      if (IS_VAR == IS_UNUSED) {
 +              /* previous opcode is ZEND_FETCH_CLASS */
 +              if ((opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_PARENT ||
 +                  (opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_SELF) {
 +                      if (Z_TYPE(EX(This)) == IS_OBJECT) {
 +                              ce = Z_OBJCE(EX(This));
 +                      } else {
 +                              ce = Z_CE(EX(This));
 +                      }
 +              }
 +      }
 +
 +      call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION,
 +              fbc, opline->extended_value, ce, object);
 +      call->prev_execute_data = EX(call);
 +      EX(call) = call;
 +
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
++      ZEND_VM_NEXT_OPCODE();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *expr_ptr, new_expr;
 +
 +      SAVE_OPLINE();
 +      if ((IS_VAR == IS_VAR || IS_VAR == IS_CV) &&
 +          UNEXPECTED(opline->extended_value & ZEND_ARRAY_ELEMENT_REF)) {
 +              expr_ptr = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1);
 +              ZVAL_MAKE_REF(expr_ptr);
 +              Z_ADDREF_P(expr_ptr);
 +              if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 +      } else {
 +              expr_ptr = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +              if (IS_VAR == IS_TMP_VAR) {
 +                      /* pass */
 +              } else if (IS_VAR == IS_CONST) {
 +                      if (Z_REFCOUNTED_P(expr_ptr)) {
 +                              Z_ADDREF_P(expr_ptr);
 +                      }
 +              } else if (IS_VAR == IS_CV) {
 +                      ZVAL_DEREF(expr_ptr);
 +                      if (Z_REFCOUNTED_P(expr_ptr)) {
 +                              Z_ADDREF_P(expr_ptr);
 +                      }
 +              } else /* if (IS_VAR == IS_VAR) */ {
 +                      if (UNEXPECTED(Z_ISREF_P(expr_ptr))) {
 +                              zend_refcounted *ref = Z_COUNTED_P(expr_ptr);
 +
 +                              expr_ptr = Z_REFVAL_P(expr_ptr);
 +                              if (UNEXPECTED(--GC_REFCOUNT(ref) == 0)) {
 +                                      ZVAL_COPY_VALUE(&new_expr, expr_ptr);
 +                                      expr_ptr = &new_expr;
 +                                      efree_size(ref, sizeof(zend_reference));
 +                              } else if (Z_OPT_REFCOUNTED_P(expr_ptr)) {
 +                                      Z_ADDREF_P(expr_ptr);
 +                              }
 +                      }
 +              }
 +      }
 +
 +      if (IS_CV != IS_UNUSED) {
 +
 +              zval *offset = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
                zend_string *str;
                zend_ulong hval;
  
@@@ -27809,66 -22980,12 +27913,66 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
                HANDLE_EXCEPTION();
        }
  
 -      do {
 -              if (IS_UNUSED == IS_CONST ||
 -                  (IS_UNUSED != IS_UNUSED && UNEXPECTED(Z_TYPE_P(obj) != IS_OBJECT))) {
 -                  if ((IS_UNUSED & (IS_VAR|IS_CV)) && Z_ISREF_P(obj)) {
 -                      obj = Z_REFVAL_P(obj);
 -                      if (EXPECTED(Z_TYPE_P(obj) == IS_OBJECT)) {
 +      constructor = Z_OBJ_HT_P(result)->get_constructor(Z_OBJ_P(result));
 +      if (constructor == NULL) {
 +              if (UNEXPECTED(EG(exception))) {
 +                      zval_ptr_dtor(result);
 +                      HANDLE_EXCEPTION();
 +              }
 +
 +              /* If there are no arguments, skip over the DO_FCALL opcode. We check if the next
 +               * opcode is DO_FCALL in case EXT instructions are used. */
 +              if (EXPECTED(opline->extended_value == 0 && (opline+1)->opcode == ZEND_DO_FCALL)) {
 +                      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 +              }
 +
 +              /* Perform a dummy function call */
 +              call = zend_vm_stack_push_call_frame(
 +                      ZEND_CALL_FUNCTION, (zend_function *) &zend_pass_function,
 +                      opline->extended_value, NULL, NULL);
 +      } else {
 +              if (EXPECTED(constructor->type == ZEND_USER_FUNCTION) && UNEXPECTED(!constructor->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&constructor->op_array);
 +              }
 +              /* We are not handling overloaded classes right now */
 +              call = zend_vm_stack_push_call_frame(
 +                      ZEND_CALL_FUNCTION | ZEND_CALL_RELEASE_THIS | ZEND_CALL_CTOR,
 +                      constructor,
 +                      opline->extended_value,
 +                      ce,
 +                      Z_OBJ_P(result));
 +              Z_ADDREF_P(result);
 +      }
 +
 +      call->prev_execute_data = EX(call);
 +      EX(call) = call;
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
++      ZEND_VM_NEXT_OPCODE();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CLONE_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +
 +      zval *obj;
 +      zend_object *clone_obj;
 +      zend_class_entry *ce, *scope;
 +      zend_function *clone;
 +      zend_object_clone_obj_t clone_call;
 +
 +      SAVE_OPLINE();
 +      obj = _get_obj_zval_ptr_unused(execute_data);
 +
 +      if (IS_UNUSED == IS_UNUSED && UNEXPECTED(Z_TYPE_P(obj) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              HANDLE_EXCEPTION();
 +      }
 +
 +      do {
 +              if (IS_UNUSED == IS_CONST ||
 +                  (IS_UNUSED != IS_UNUSED && UNEXPECTED(Z_TYPE_P(obj) != IS_OBJECT))) {
 +                  if ((IS_UNUSED & (IS_VAR|IS_CV)) && Z_ISREF_P(obj)) {
 +                      obj = Z_REFVAL_P(obj);
 +                      if (EXPECTED(Z_TYPE_P(obj) == IS_OBJECT)) {
                                break;
                                }
                        }
@@@ -29429,242 -24077,74 +29538,241 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
        call->prev_execute_data = EX(call);
        EX(call) = call;
  
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+       ZEND_VM_NEXT_OPCODE();
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
        USE_OPLINE
 +      zval *function_name;
 +      zend_class_entry *ce;
 +      zend_object *object;
 +      zend_function *fbc;
 +      zend_execute_data *call;
  
        SAVE_OPLINE();
 -      if (IS_UNUSED == IS_UNUSED) {
 -              zend_constant *c;
 -
 -              if (EXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2))))) {
 -                      c = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)));
 -              } else if ((c = zend_quick_get_constant(EX_CONSTANT(opline->op2) + 1, opline->extended_value)) == NULL) {
 -                      if ((opline->extended_value & IS_CONSTANT_UNQUALIFIED) != 0) {
 -                              char *actual = (char *)zend_memrchr(Z_STRVAL_P(EX_CONSTANT(opline->op2)), '\\', Z_STRLEN_P(EX_CONSTANT(opline->op2)));
 -                              if (!actual) {
 -                                      ZVAL_STR_COPY(EX_VAR(opline->result.var), Z_STR_P(EX_CONSTANT(opline->op2)));
 -                              } else {
 -                                      actual++;
 -                                      ZVAL_STRINGL(EX_VAR(opline->result.var),
 -                                                      actual, Z_STRLEN_P(EX_CONSTANT(opline->op2)) - (actual - Z_STRVAL_P(EX_CONSTANT(opline->op2))));
 +
 +      if (IS_UNUSED == IS_CONST) {
 +              /* no function found. try a static method in class */
 +              ce = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)));
 +              if (UNEXPECTED(ce == NULL)) {
 +                      ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 +                      if (UNEXPECTED(ce == NULL)) {
 +                              ZEND_ASSERT(EG(exception));
 +                              HANDLE_EXCEPTION();
 +                      }
 +                      CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
 +              }
 +      } else if (IS_UNUSED == IS_UNUSED) {
 +              ce = zend_fetch_class(NULL, opline->op1.num);
 +              if (UNEXPECTED(ce == NULL)) {
 +                      ZEND_ASSERT(EG(exception));
 +
 +                      HANDLE_EXCEPTION();
 +              }
 +      } else {
 +              ce = Z_CE_P(EX_VAR(opline->op1.var));
 +      }
 +
 +      if (IS_UNUSED == IS_CONST &&
 +          IS_CONST == IS_CONST &&
 +          EXPECTED((fbc = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)))) != NULL)) {
 +              /* nothing to do */
 +      } else if (IS_UNUSED != IS_CONST &&
 +                 IS_CONST == IS_CONST &&
 +                 (fbc = CACHED_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce))) {
 +              /* do nothing */
 +      } else if (IS_CONST != IS_UNUSED) {
 +
 +
 +              function_name = EX_CONSTANT(opline->op2);
 +              if (IS_CONST != IS_CONST) {
 +                      if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
 +                              do {
 +                                      if (IS_CONST & (IS_VAR|IS_CV) && Z_ISREF_P(function_name)) {
 +                                              function_name = Z_REFVAL_P(function_name);
 +                                              if (EXPECTED(Z_TYPE_P(function_name) == IS_STRING)) {
 +                                                      break;
 +                                              }
 +                                      } else if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(function_name) == IS_UNDEF)) {
 +                                              GET_OP2_UNDEF_CV(function_name, BP_VAR_R);
 +                                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                                      HANDLE_EXCEPTION();
 +                                              }
 +                                      }
 +                                      zend_throw_error(NULL, "Function name must be a string");
 +
 +                                      HANDLE_EXCEPTION();
 +                              } while (0);
 +                      }
 +              }
 +
 +              if (ce->get_static_method) {
 +                      fbc = ce->get_static_method(ce, Z_STR_P(function_name));
 +              } else {
 +                      fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), ((IS_CONST == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL));
 +              }
 +              if (UNEXPECTED(fbc == NULL)) {
 +                      if (EXPECTED(!EG(exception))) {
 +                              zend_throw_error(NULL, "Call to undefined method %s::%s()", ZSTR_VAL(ce->name), Z_STRVAL_P(function_name));
 +                      }
 +
 +                      HANDLE_EXCEPTION();
 +              }
 +              if (IS_CONST == IS_CONST &&
 +                  EXPECTED(fbc->type <= ZEND_USER_FUNCTION) &&
 +                  EXPECTED(!(fbc->common.fn_flags & (ZEND_ACC_CALL_VIA_TRAMPOLINE|ZEND_ACC_NEVER_CACHE)))) {
 +                      if (IS_UNUSED == IS_CONST) {
 +                              CACHE_PTR(Z_CACHE_SLOT_P(function_name), fbc);
 +                      } else {
 +                              CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(function_name), ce, fbc);
 +                      }
 +              }
 +              if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&fbc->op_array);
 +              }
 +              if (IS_CONST != IS_CONST) {
 +
 +              }
 +      } else {
 +              if (UNEXPECTED(ce->constructor == NULL)) {
 +                      zend_throw_error(NULL, "Cannot call constructor");
 +                      HANDLE_EXCEPTION();
 +              }
 +              if (Z_TYPE(EX(This)) == IS_OBJECT && Z_OBJ(EX(This))->ce != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
 +                      zend_throw_error(NULL, "Cannot call private %s::__construct()", ZSTR_VAL(ce->name));
 +                      HANDLE_EXCEPTION();
 +              }
 +              fbc = ce->constructor;
 +              if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&fbc->op_array);
 +              }
 +      }
 +
 +      object = NULL;
 +      if (!(fbc->common.fn_flags & ZEND_ACC_STATIC)) {
 +              if (Z_TYPE(EX(This)) == IS_OBJECT && instanceof_function(Z_OBJCE(EX(This)), ce)) {
 +                      object = Z_OBJ(EX(This));
 +                      ce = object->ce;
 +              } else {
 +                      if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
 +                              /* Allowed for PHP 4 compatibility. */
 +                              zend_error(
 +                                      E_DEPRECATED,
 +                                      "Non-static method %s::%s() should not be called statically",
 +                                      ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
 +                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                      HANDLE_EXCEPTION();
                                }
 -                              /* non-qualified constant - allow text substitution */
 -                              zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'",
 -                                              Z_STRVAL_P(EX_VAR(opline->result.var)), Z_STRVAL_P(EX_VAR(opline->result.var)));
 -                              ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
                        } else {
 -                              zend_throw_error(NULL, "Undefined constant '%s'", Z_STRVAL_P(EX_CONSTANT(opline->op2)));
 +                              /* An internal function assumes $this is present and won't check that.
 +                               * So PHP would crash by allowing the call. */
 +                              zend_throw_error(
 +                                      zend_ce_error,
 +                                      "Non-static method %s::%s() cannot be called statically",
 +                                      ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
                                HANDLE_EXCEPTION();
                        }
 -              } else {
 -                      CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), c);
                }
 -#ifdef ZTS
 -              if (c->flags & CONST_PERSISTENT) {
 -                      ZVAL_DUP(EX_VAR(opline->result.var), &c->value);
 +      }
 +
 +      if (IS_UNUSED == IS_UNUSED) {
 +              /* previous opcode is ZEND_FETCH_CLASS */
 +              if ((opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_PARENT ||
 +                  (opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_SELF) {
 +                      if (Z_TYPE(EX(This)) == IS_OBJECT) {
 +                              ce = Z_OBJCE(EX(This));
 +                      } else {
 +                              ce = Z_CE(EX(This));
 +                      }
 +              }
 +      }
 +
 +      call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION,
 +              fbc, opline->extended_value, ce, object);
 +      call->prev_execute_data = EX(call);
 +      EX(call) = call;
 +
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
++      ZEND_VM_NEXT_OPCODE();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_constant *c;
 +
 +      SAVE_OPLINE();
 +
 +      if (EXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2))))) {
 +              c = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)));
 +      } else if ((c = zend_quick_get_constant(EX_CONSTANT(opline->op2) + 1, opline->extended_value)) == NULL) {
 +              if ((opline->extended_value & IS_CONSTANT_UNQUALIFIED) != 0) {
 +                      char *actual = (char *)zend_memrchr(Z_STRVAL_P(EX_CONSTANT(opline->op2)), '\\', Z_STRLEN_P(EX_CONSTANT(opline->op2)));
 +                      if (!actual) {
 +                              ZVAL_STR_COPY(EX_VAR(opline->result.var), Z_STR_P(EX_CONSTANT(opline->op2)));
 +                      } else {
 +                              actual++;
 +                              ZVAL_STRINGL(EX_VAR(opline->result.var),
 +                                              actual, Z_STRLEN_P(EX_CONSTANT(opline->op2)) - (actual - Z_STRVAL_P(EX_CONSTANT(opline->op2))));
 +                      }
 +                      /* non-qualified constant - allow text substitution */
 +                      zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'",
 +                                      Z_STRVAL_P(EX_VAR(opline->result.var)), Z_STRVAL_P(EX_VAR(opline->result.var)));
 +                      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
                } else {
 -                      ZVAL_COPY(EX_VAR(opline->result.var), &c->value);
 +                      zend_throw_error(NULL, "Undefined constant '%s'", Z_STRVAL_P(EX_CONSTANT(opline->op2)));
 +                      HANDLE_EXCEPTION();
                }
 -#else
 +      } else {
 +              CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), c);
 +      }
 +
 +#ifdef ZTS
 +      if (c->flags & CONST_PERSISTENT) {
 +              ZVAL_DUP(EX_VAR(opline->result.var), &c->value);
 +      } else {
                ZVAL_COPY(EX_VAR(opline->result.var), &c->value);
 +      }
 +#else
 +      ZVAL_COPY(EX_VAR(opline->result.var), &c->value);
  #endif
 -      } else {
 -              /* class constant */
 -              zend_class_entry *ce;
 -              zval *value;
  
 -              do {
 -                      if (IS_UNUSED == IS_CONST) {
 -                              if (EXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2))))) {
 -                                      value = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)));
 -                                      ZVAL_DEREF(value);
 +      ZEND_VM_NEXT_OPCODE();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      zend_class_entry *ce, *scope;
 +      zend_class_constant *c;
 +      zval *value;
 +      USE_OPLINE
 +
 +      SAVE_OPLINE();
 +
 +      do {
 +              if (IS_UNUSED == IS_CONST) {
 +                      if (EXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2))))) {
 +                              value = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)));
  #ifdef ZTS
 -                                      ce = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)));
 +                              ce = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)));
  #endif
 -                                      break;
 -                              } else if (EXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1))))) {
 -                                      ce = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)));
 -                              } else {
 -                                      ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
 -                                      if (UNEXPECTED(ce == NULL)) {
 -                                              if (EXPECTED(!EG(exception))) {
 -                                                      zend_throw_error(NULL, "Class '%s' not found", Z_STRVAL_P(EX_CONSTANT(opline->op1)));
 -                                              }
 -                                              HANDLE_EXCEPTION();
 -                                      }
 -                                      CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
 +                              break;
 +                      } else if (EXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1))))) {
 +                              ce = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)));
 +                      } else {
 +                              ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
 +                              if (UNEXPECTED(ce == NULL)) {
 +                                      ZEND_ASSERT(EG(exception));
 +                                      HANDLE_EXCEPTION();
 +                              }
 +                              CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
 +                      }
 +              } else {
 +                      if (IS_UNUSED == IS_UNUSED) {
 +                              ce = zend_fetch_class(NULL, opline->op1.num);
 +                              if (UNEXPECTED(ce == NULL)) {
 +                                      ZEND_ASSERT(EG(exception));
 +                                      HANDLE_EXCEPTION();
                                }
                        } else {
                                ce = Z_CE_P(EX_VAR(opline->op1.var));
@@@ -30260,130 -25013,266 +30368,130 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
  
                        HANDLE_EXCEPTION();
                }
 +      } else {
 +              ce = Z_CE_P(EX_VAR(opline->op1.var));
 +      }
  
 -              if (UNEXPECTED(var_ptr == &EG(error_zval))) {
 -                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 -                              ZVAL_NULL(EX_VAR(opline->result.var));
 -                      }
 -              } else {
 -                      ZVAL_DEREF(var_ptr);
 -                      SEPARATE_ZVAL_NOREF(var_ptr);
 -
 -                      binary_op(var_ptr, var_ptr, value);
 -
 -                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 -                              ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
 -                      }
 -              }
 -      } while (0);
 -
 -      FREE_OP(free_op_data1);
 -
 -      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 -}
 +      if (IS_UNUSED == IS_CONST &&
 +          IS_UNUSED == IS_CONST &&
 +          EXPECTED((fbc = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)))) != NULL)) {
 +              /* nothing to do */
 +      } else if (IS_UNUSED != IS_CONST &&
 +                 IS_UNUSED == IS_CONST &&
 +                 (fbc = CACHED_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce))) {
 +              /* do nothing */
 +      } else if (IS_UNUSED != IS_UNUSED) {
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_ADD_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -#if 0 || (IS_UNUSED != IS_UNUSED)
 -      USE_OPLINE
  
 -# if 0 || (IS_UNUSED != IS_UNUSED)
 -      if (EXPECTED(opline->extended_value == 0)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_UNUSED_UNUSED(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -# endif
 -      if (EXPECTED(opline->extended_value == ZEND_ASSIGN_DIM)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      } else /* if (EXPECTED(opline->extended_value == ZEND_ASSIGN_OBJ)) */ {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -#else
 -      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -#endif
 -}
 -
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SUB_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -#if 0 || (IS_UNUSED != IS_UNUSED)
 -      USE_OPLINE
 -
 -# if 0 || (IS_UNUSED != IS_UNUSED)
 -      if (EXPECTED(opline->extended_value == 0)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_UNUSED_UNUSED(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -# endif
 -      if (EXPECTED(opline->extended_value == ZEND_ASSIGN_DIM)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      } else /* if (EXPECTED(opline->extended_value == ZEND_ASSIGN_OBJ)) */ {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -#else
 -      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -#endif
 -}
 -
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_MUL_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -#if 0 || (IS_UNUSED != IS_UNUSED)
 -      USE_OPLINE
 -
 -# if 0 || (IS_UNUSED != IS_UNUSED)
 -      if (EXPECTED(opline->extended_value == 0)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_UNUSED_UNUSED(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -# endif
 -      if (EXPECTED(opline->extended_value == ZEND_ASSIGN_DIM)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      } else /* if (EXPECTED(opline->extended_value == ZEND_ASSIGN_OBJ)) */ {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -#else
 -      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -#endif
 -}
 -
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIV_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -#if 0 || (IS_UNUSED != IS_UNUSED)
 -      USE_OPLINE
 -
 -# if 0 || (IS_UNUSED != IS_UNUSED)
 -      if (EXPECTED(opline->extended_value == 0)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_UNUSED_UNUSED(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -# endif
 -      if (EXPECTED(opline->extended_value == ZEND_ASSIGN_DIM)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      } else /* if (EXPECTED(opline->extended_value == ZEND_ASSIGN_OBJ)) */ {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -#else
 -      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -#endif
 -}
 -
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_MOD_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -#if 0 || (IS_UNUSED != IS_UNUSED)
 -      USE_OPLINE
 -
 -# if 0 || (IS_UNUSED != IS_UNUSED)
 -      if (EXPECTED(opline->extended_value == 0)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_UNUSED_UNUSED(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -# endif
 -      if (EXPECTED(opline->extended_value == ZEND_ASSIGN_DIM)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      } else /* if (EXPECTED(opline->extended_value == ZEND_ASSIGN_OBJ)) */ {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -#else
 -      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -#endif
 -}
 -
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SL_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -#if 0 || (IS_UNUSED != IS_UNUSED)
 -      USE_OPLINE
 -
 -# if 0 || (IS_UNUSED != IS_UNUSED)
 -      if (EXPECTED(opline->extended_value == 0)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_UNUSED_UNUSED(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -# endif
 -      if (EXPECTED(opline->extended_value == ZEND_ASSIGN_DIM)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      } else /* if (EXPECTED(opline->extended_value == ZEND_ASSIGN_OBJ)) */ {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -#else
 -      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -#endif
 -}
 -
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SR_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -#if 0 || (IS_UNUSED != IS_UNUSED)
 -      USE_OPLINE
 -
 -# if 0 || (IS_UNUSED != IS_UNUSED)
 -      if (EXPECTED(opline->extended_value == 0)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_UNUSED_UNUSED(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -# endif
 -      if (EXPECTED(opline->extended_value == ZEND_ASSIGN_DIM)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      } else /* if (EXPECTED(opline->extended_value == ZEND_ASSIGN_OBJ)) */ {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -#else
 -      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -#endif
 -}
 +              function_name = NULL;
 +              if (IS_UNUSED != IS_CONST) {
 +                      if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
 +                              do {
 +                                      if (IS_UNUSED & (IS_VAR|IS_CV) && Z_ISREF_P(function_name)) {
 +                                              function_name = Z_REFVAL_P(function_name);
 +                                              if (EXPECTED(Z_TYPE_P(function_name) == IS_STRING)) {
 +                                                      break;
 +                                              }
 +                                      } else if (IS_UNUSED == IS_CV && UNEXPECTED(Z_TYPE_P(function_name) == IS_UNDEF)) {
 +                                              GET_OP2_UNDEF_CV(function_name, BP_VAR_R);
 +                                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                                      HANDLE_EXCEPTION();
 +                                              }
 +                                      }
 +                                      zend_throw_error(NULL, "Function name must be a string");
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_CONCAT_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -#if 0 || (IS_UNUSED != IS_UNUSED)
 -      USE_OPLINE
 +                                      HANDLE_EXCEPTION();
 +                              } while (0);
 +                      }
 +              }
  
 -# if 0 || (IS_UNUSED != IS_UNUSED)
 -      if (EXPECTED(opline->extended_value == 0)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_UNUSED_UNUSED(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -# endif
 -      if (EXPECTED(opline->extended_value == ZEND_ASSIGN_DIM)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      } else /* if (EXPECTED(opline->extended_value == ZEND_ASSIGN_OBJ)) */ {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -#else
 -      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -#endif
 -}
 +              if (ce->get_static_method) {
 +                      fbc = ce->get_static_method(ce, Z_STR_P(function_name));
 +              } else {
 +                      fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), ((IS_UNUSED == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL));
 +              }
 +              if (UNEXPECTED(fbc == NULL)) {
 +                      if (EXPECTED(!EG(exception))) {
 +                              zend_throw_error(NULL, "Call to undefined method %s::%s()", ZSTR_VAL(ce->name), Z_STRVAL_P(function_name));
 +                      }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_BW_OR_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -#if 0 || (IS_UNUSED != IS_UNUSED)
 -      USE_OPLINE
 +                      HANDLE_EXCEPTION();
 +              }
 +              if (IS_UNUSED == IS_CONST &&
 +                  EXPECTED(fbc->type <= ZEND_USER_FUNCTION) &&
 +                  EXPECTED(!(fbc->common.fn_flags & (ZEND_ACC_CALL_VIA_TRAMPOLINE|ZEND_ACC_NEVER_CACHE)))) {
 +                      if (IS_UNUSED == IS_CONST) {
 +                              CACHE_PTR(Z_CACHE_SLOT_P(function_name), fbc);
 +                      } else {
 +                              CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(function_name), ce, fbc);
 +                      }
 +              }
 +              if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&fbc->op_array);
 +              }
 +              if (IS_UNUSED != IS_CONST) {
  
 -# if 0 || (IS_UNUSED != IS_UNUSED)
 -      if (EXPECTED(opline->extended_value == 0)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_UNUSED_UNUSED(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -# endif
 -      if (EXPECTED(opline->extended_value == ZEND_ASSIGN_DIM)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      } else /* if (EXPECTED(opline->extended_value == ZEND_ASSIGN_OBJ)) */ {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +              }
 +      } else {
 +              if (UNEXPECTED(ce->constructor == NULL)) {
 +                      zend_throw_error(NULL, "Cannot call constructor");
 +                      HANDLE_EXCEPTION();
 +              }
 +              if (Z_TYPE(EX(This)) == IS_OBJECT && Z_OBJ(EX(This))->ce != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
 +                      zend_throw_error(NULL, "Cannot call private %s::__construct()", ZSTR_VAL(ce->name));
 +                      HANDLE_EXCEPTION();
 +              }
 +              fbc = ce->constructor;
 +              if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&fbc->op_array);
 +              }
        }
 -#else
 -      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -#endif
 -}
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_BW_AND_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -#if 0 || (IS_UNUSED != IS_UNUSED)
 -      USE_OPLINE
 -
 -# if 0 || (IS_UNUSED != IS_UNUSED)
 -      if (EXPECTED(opline->extended_value == 0)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_UNUSED_UNUSED(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -# endif
 -      if (EXPECTED(opline->extended_value == ZEND_ASSIGN_DIM)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      } else /* if (EXPECTED(opline->extended_value == ZEND_ASSIGN_OBJ)) */ {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      object = NULL;
 +      if (!(fbc->common.fn_flags & ZEND_ACC_STATIC)) {
 +              if (Z_TYPE(EX(This)) == IS_OBJECT && instanceof_function(Z_OBJCE(EX(This)), ce)) {
 +                      object = Z_OBJ(EX(This));
 +                      ce = object->ce;
 +              } else {
 +                      if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
 +                              /* Allowed for PHP 4 compatibility. */
 +                              zend_error(
 +                                      E_DEPRECATED,
 +                                      "Non-static method %s::%s() should not be called statically",
 +                                      ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
 +                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                      HANDLE_EXCEPTION();
 +                              }
 +                      } else {
 +                              /* An internal function assumes $this is present and won't check that.
 +                               * So PHP would crash by allowing the call. */
 +                              zend_throw_error(
 +                                      zend_ce_error,
 +                                      "Non-static method %s::%s() cannot be called statically",
 +                                      ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
 +                              HANDLE_EXCEPTION();
 +                      }
 +              }
        }
 -#else
 -      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -#endif
 -}
 -
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_BW_XOR_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -#if 0 || (IS_UNUSED != IS_UNUSED)
 -      USE_OPLINE
  
 -# if 0 || (IS_UNUSED != IS_UNUSED)
 -      if (EXPECTED(opline->extended_value == 0)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_UNUSED_UNUSED(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -# endif
 -      if (EXPECTED(opline->extended_value == ZEND_ASSIGN_DIM)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      } else /* if (EXPECTED(opline->extended_value == ZEND_ASSIGN_OBJ)) */ {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      if (IS_UNUSED == IS_UNUSED) {
 +              /* previous opcode is ZEND_FETCH_CLASS */
 +              if ((opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_PARENT ||
 +                  (opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_SELF) {
 +                      if (Z_TYPE(EX(This)) == IS_OBJECT) {
 +                              ce = Z_OBJCE(EX(This));
 +                      } else {
 +                              ce = Z_CE(EX(This));
 +                      }
 +              }
        }
 -#else
 -      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -#endif
 -}
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_POW_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -#if 0 || (IS_UNUSED != IS_UNUSED)
 -      USE_OPLINE
 +      call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION,
 +              fbc, opline->extended_value, ce, object);
 +      call->prev_execute_data = EX(call);
 +      EX(call) = call;
  
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 -# if 0 || (IS_UNUSED != IS_UNUSED)
 -      if (EXPECTED(opline->extended_value == 0)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_UNUSED_UNUSED(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -# endif
 -      if (EXPECTED(opline->extended_value == ZEND_ASSIGN_DIM)) {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      } else /* if (EXPECTED(opline->extended_value == ZEND_ASSIGN_OBJ)) */ {
 -              ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -#else
 -      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_UNUSED_UNUSED(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -#endif
++      ZEND_VM_NEXT_OPCODE();
  }
  
  static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@@ -32111,165 -26508,9 +32224,164 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
        call->prev_execute_data = EX(call);
        EX(call) = call;
  
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+       ZEND_VM_NEXT_OPCODE();
  }
  
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zval *function_name;
 +      zend_class_entry *ce;
 +      zend_object *object;
 +      zend_function *fbc;
 +      zend_execute_data *call;
 +
 +      SAVE_OPLINE();
 +
 +      if (IS_UNUSED == IS_CONST) {
 +              /* no function found. try a static method in class */
 +              ce = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)));
 +              if (UNEXPECTED(ce == NULL)) {
 +                      ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 +                      if (UNEXPECTED(ce == NULL)) {
 +                              ZEND_ASSERT(EG(exception));
 +                              HANDLE_EXCEPTION();
 +                      }
 +                      CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
 +              }
 +      } else if (IS_UNUSED == IS_UNUSED) {
 +              ce = zend_fetch_class(NULL, opline->op1.num);
 +              if (UNEXPECTED(ce == NULL)) {
 +                      ZEND_ASSERT(EG(exception));
 +
 +                      HANDLE_EXCEPTION();
 +              }
 +      } else {
 +              ce = Z_CE_P(EX_VAR(opline->op1.var));
 +      }
 +
 +      if (IS_UNUSED == IS_CONST &&
 +          IS_CV == IS_CONST &&
 +          EXPECTED((fbc = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)))) != NULL)) {
 +              /* nothing to do */
 +      } else if (IS_UNUSED != IS_CONST &&
 +                 IS_CV == IS_CONST &&
 +                 (fbc = CACHED_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce))) {
 +              /* do nothing */
 +      } else if (IS_CV != IS_UNUSED) {
 +
 +
 +              function_name = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
 +              if (IS_CV != IS_CONST) {
 +                      if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
 +                              do {
 +                                      if (IS_CV & (IS_VAR|IS_CV) && Z_ISREF_P(function_name)) {
 +                                              function_name = Z_REFVAL_P(function_name);
 +                                              if (EXPECTED(Z_TYPE_P(function_name) == IS_STRING)) {
 +                                                      break;
 +                                              }
 +                                      } else if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(function_name) == IS_UNDEF)) {
 +                                              GET_OP2_UNDEF_CV(function_name, BP_VAR_R);
 +                                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                                      HANDLE_EXCEPTION();
 +                                              }
 +                                      }
 +                                      zend_throw_error(NULL, "Function name must be a string");
 +
 +                                      HANDLE_EXCEPTION();
 +                              } while (0);
 +                      }
 +              }
 +
 +              if (ce->get_static_method) {
 +                      fbc = ce->get_static_method(ce, Z_STR_P(function_name));
 +              } else {
 +                      fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), ((IS_CV == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL));
 +              }
 +              if (UNEXPECTED(fbc == NULL)) {
 +                      if (EXPECTED(!EG(exception))) {
 +                              zend_throw_error(NULL, "Call to undefined method %s::%s()", ZSTR_VAL(ce->name), Z_STRVAL_P(function_name));
 +                      }
 +
 +                      HANDLE_EXCEPTION();
 +              }
 +              if (IS_CV == IS_CONST &&
 +                  EXPECTED(fbc->type <= ZEND_USER_FUNCTION) &&
 +                  EXPECTED(!(fbc->common.fn_flags & (ZEND_ACC_CALL_VIA_TRAMPOLINE|ZEND_ACC_NEVER_CACHE)))) {
 +                      if (IS_UNUSED == IS_CONST) {
 +                              CACHE_PTR(Z_CACHE_SLOT_P(function_name), fbc);
 +                      } else {
 +                              CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(function_name), ce, fbc);
 +                      }
 +              }
 +              if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&fbc->op_array);
 +              }
 +              if (IS_CV != IS_CONST) {
 +
 +              }
 +      } else {
 +              if (UNEXPECTED(ce->constructor == NULL)) {
 +                      zend_throw_error(NULL, "Cannot call constructor");
 +                      HANDLE_EXCEPTION();
 +              }
 +              if (Z_TYPE(EX(This)) == IS_OBJECT && Z_OBJ(EX(This))->ce != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
 +                      zend_throw_error(NULL, "Cannot call private %s::__construct()", ZSTR_VAL(ce->name));
 +                      HANDLE_EXCEPTION();
 +              }
 +              fbc = ce->constructor;
 +              if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&fbc->op_array);
 +              }
 +      }
 +
 +      object = NULL;
 +      if (!(fbc->common.fn_flags & ZEND_ACC_STATIC)) {
 +              if (Z_TYPE(EX(This)) == IS_OBJECT && instanceof_function(Z_OBJCE(EX(This)), ce)) {
 +                      object = Z_OBJ(EX(This));
 +                      ce = object->ce;
 +              } else {
 +                      if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
 +                              /* Allowed for PHP 4 compatibility. */
 +                              zend_error(
 +                                      E_DEPRECATED,
 +                                      "Non-static method %s::%s() should not be called statically",
 +                                      ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
 +                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                      HANDLE_EXCEPTION();
 +                              }
 +                      } else {
 +                              /* An internal function assumes $this is present and won't check that.
 +                               * So PHP would crash by allowing the call. */
 +                              zend_throw_error(
 +                                      zend_ce_error,
 +                                      "Non-static method %s::%s() cannot be called statically",
 +                                      ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
 +                              HANDLE_EXCEPTION();
 +                      }
 +              }
 +      }
 +
 +      if (IS_UNUSED == IS_UNUSED) {
 +              /* previous opcode is ZEND_FETCH_CLASS */
 +              if ((opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_PARENT ||
 +                  (opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_SELF) {
 +                      if (Z_TYPE(EX(This)) == IS_OBJECT) {
 +                              ce = Z_OBJCE(EX(This));
 +                      } else {
 +                              ce = Z_CE(EX(This));
 +                      }
 +              }
 +      }
 +
 +      call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION,
 +              fbc, opline->extended_value, ce, object);
 +      call->prev_execute_data = EX(call);
 +      EX(call) = call;
 +
++      ZEND_VM_NEXT_OPCODE();
 +}
 +
  static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
        zval *array;
@@@ -33999,166 -28017,9 +34117,164 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
        call->prev_execute_data = EX(call);
        EX(call) = call;
  
-       zval_ptr_dtor_nogc(free_op2);
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+       ZEND_VM_NEXT_OPCODE();
  }
  
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zval *function_name;
 +      zend_class_entry *ce;
 +      zend_object *object;
 +      zend_function *fbc;
 +      zend_execute_data *call;
 +
 +      SAVE_OPLINE();
 +
 +      if (IS_UNUSED == IS_CONST) {
 +              /* no function found. try a static method in class */
 +              ce = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)));
 +              if (UNEXPECTED(ce == NULL)) {
 +                      ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 +                      if (UNEXPECTED(ce == NULL)) {
 +                              ZEND_ASSERT(EG(exception));
 +                              HANDLE_EXCEPTION();
 +                      }
 +                      CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
 +              }
 +      } else if (IS_UNUSED == IS_UNUSED) {
 +              ce = zend_fetch_class(NULL, opline->op1.num);
 +              if (UNEXPECTED(ce == NULL)) {
 +                      ZEND_ASSERT(EG(exception));
 +                      zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 +                      HANDLE_EXCEPTION();
 +              }
 +      } else {
 +              ce = Z_CE_P(EX_VAR(opline->op1.var));
 +      }
 +
 +      if (IS_UNUSED == IS_CONST &&
 +          (IS_TMP_VAR|IS_VAR) == IS_CONST &&
 +          EXPECTED((fbc = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)))) != NULL)) {
 +              /* nothing to do */
 +      } else if (IS_UNUSED != IS_CONST &&
 +                 (IS_TMP_VAR|IS_VAR) == IS_CONST &&
 +                 (fbc = CACHED_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce))) {
 +              /* do nothing */
 +      } else if ((IS_TMP_VAR|IS_VAR) != IS_UNUSED) {
 +              zend_free_op free_op2;
 +
 +              function_name = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +              if ((IS_TMP_VAR|IS_VAR) != IS_CONST) {
 +                      if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
 +                              do {
 +                                      if ((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV) && Z_ISREF_P(function_name)) {
 +                                              function_name = Z_REFVAL_P(function_name);
 +                                              if (EXPECTED(Z_TYPE_P(function_name) == IS_STRING)) {
 +                                                      break;
 +                                              }
 +                                      } else if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(function_name) == IS_UNDEF)) {
 +                                              GET_OP2_UNDEF_CV(function_name, BP_VAR_R);
 +                                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                                      HANDLE_EXCEPTION();
 +                                              }
 +                                      }
 +                                      zend_throw_error(NULL, "Function name must be a string");
 +                                      zval_ptr_dtor_nogc(free_op2);
 +                                      HANDLE_EXCEPTION();
 +                              } while (0);
 +                      }
 +              }
 +
 +              if (ce->get_static_method) {
 +                      fbc = ce->get_static_method(ce, Z_STR_P(function_name));
 +              } else {
 +                      fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL));
 +              }
 +              if (UNEXPECTED(fbc == NULL)) {
 +                      if (EXPECTED(!EG(exception))) {
 +                              zend_throw_error(NULL, "Call to undefined method %s::%s()", ZSTR_VAL(ce->name), Z_STRVAL_P(function_name));
 +                      }
 +                      zval_ptr_dtor_nogc(free_op2);
 +                      HANDLE_EXCEPTION();
 +              }
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CONST &&
 +                  EXPECTED(fbc->type <= ZEND_USER_FUNCTION) &&
 +                  EXPECTED(!(fbc->common.fn_flags & (ZEND_ACC_CALL_VIA_TRAMPOLINE|ZEND_ACC_NEVER_CACHE)))) {
 +                      if (IS_UNUSED == IS_CONST) {
 +                              CACHE_PTR(Z_CACHE_SLOT_P(function_name), fbc);
 +                      } else {
 +                              CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(function_name), ce, fbc);
 +                      }
 +              }
 +              if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&fbc->op_array);
 +              }
 +              if ((IS_TMP_VAR|IS_VAR) != IS_CONST) {
 +                      zval_ptr_dtor_nogc(free_op2);
 +              }
 +      } else {
 +              if (UNEXPECTED(ce->constructor == NULL)) {
 +                      zend_throw_error(NULL, "Cannot call constructor");
 +                      HANDLE_EXCEPTION();
 +              }
 +              if (Z_TYPE(EX(This)) == IS_OBJECT && Z_OBJ(EX(This))->ce != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
 +                      zend_throw_error(NULL, "Cannot call private %s::__construct()", ZSTR_VAL(ce->name));
 +                      HANDLE_EXCEPTION();
 +              }
 +              fbc = ce->constructor;
 +              if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&fbc->op_array);
 +              }
 +      }
 +
 +      object = NULL;
 +      if (!(fbc->common.fn_flags & ZEND_ACC_STATIC)) {
 +              if (Z_TYPE(EX(This)) == IS_OBJECT && instanceof_function(Z_OBJCE(EX(This)), ce)) {
 +                      object = Z_OBJ(EX(This));
 +                      ce = object->ce;
 +              } else {
 +                      if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
 +                              /* Allowed for PHP 4 compatibility. */
 +                              zend_error(
 +                                      E_DEPRECATED,
 +                                      "Non-static method %s::%s() should not be called statically",
 +                                      ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
 +                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                      HANDLE_EXCEPTION();
 +                              }
 +                      } else {
 +                              /* An internal function assumes $this is present and won't check that.
 +                               * So PHP would crash by allowing the call. */
 +                              zend_throw_error(
 +                                      zend_ce_error,
 +                                      "Non-static method %s::%s() cannot be called statically",
 +                                      ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
 +                              HANDLE_EXCEPTION();
 +                      }
 +              }
 +      }
 +
 +      if (IS_UNUSED == IS_UNUSED) {
 +              /* previous opcode is ZEND_FETCH_CLASS */
 +              if ((opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_PARENT ||
 +                  (opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_SELF) {
 +                      if (Z_TYPE(EX(This)) == IS_OBJECT) {
 +                              ce = Z_OBJCE(EX(This));
 +                      } else {
 +                              ce = Z_CE(EX(This));
 +                      }
 +              }
 +      }
 +
 +      call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION,
 +              fbc, opline->extended_value, ce, object);
 +      call->prev_execute_data = EX(call);
 +      EX(call) = call;
 +
++      ZEND_VM_NEXT_OPCODE();
 +}
 +
  static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_UNUSED_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
        zval *array;
@@@ -46440,132 -38129,258 +46560,136 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
        ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SUB_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
        USE_OPLINE
 -      zend_free_op free_op2;
 -      zval *op1, *op2, *result;
 +      zval *function_name;
  
 -      op1 = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
 -      op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 -      if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
 -              if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
 -                      result = EX_VAR(opline->result.var);
 -                      fast_long_sub_function(result, op1, op2);
 -                      ZEND_VM_NEXT_OPCODE();
 -              } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
 -                      result = EX_VAR(opline->result.var);
 -                      ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) - Z_DVAL_P(op2));
 -                      ZEND_VM_NEXT_OPCODE();
 -              }
 -      } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
 -              if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
 -                      result = EX_VAR(opline->result.var);
 -                      ZVAL_DOUBLE(result, Z_DVAL_P(op1) - Z_DVAL_P(op2));
 -                      ZEND_VM_NEXT_OPCODE();
 -              } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
 -                      result = EX_VAR(opline->result.var);
 -                      ZVAL_DOUBLE(result, Z_DVAL_P(op1) - ((double)Z_LVAL_P(op2)));
 -                      ZEND_VM_NEXT_OPCODE();
 -              }
 -      }
 +      zval *object;
 +      zend_function *fbc;
 +      zend_class_entry *called_scope;
 +      zend_object *obj;
 +      zend_execute_data *call;
 +      uint32_t call_info;
  
        SAVE_OPLINE();
 -      if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
 -              op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
 -      }
 -      if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
 -              op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
 -      }
 -      sub_function(EX_VAR(opline->result.var), op1, op2);
  
 -      zval_ptr_dtor_nogc(free_op2);
 -      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 -}
 +      function_name = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_MUL_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -      USE_OPLINE
 -      zend_free_op free_op2;
 -      zval *op1, *op2, *result;
 +      if (IS_CV != IS_CONST &&
 +          UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
 +              do {
 +                      if ((IS_CV & (IS_VAR|IS_CV)) && Z_ISREF_P(function_name)) {
 +                              function_name = Z_REFVAL_P(function_name);
 +                              if (EXPECTED(Z_TYPE_P(function_name) == IS_STRING)) {
 +                                      break;
 +                              }
 +                      } else if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(function_name) == IS_UNDEF)) {
 +                              GET_OP2_UNDEF_CV(function_name, BP_VAR_R);
 +                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                      HANDLE_EXCEPTION();
 +                              }
 +                      }
 +                      zend_throw_error(NULL, "Method name must be a string");
  
 -      op1 = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
 -      op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 -      if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
 -              if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
 -                      zend_long overflow;
  
 -                      result = EX_VAR(opline->result.var);
 -                      ZEND_SIGNED_MULTIPLY_LONG(Z_LVAL_P(op1), Z_LVAL_P(op2), Z_LVAL_P(result), Z_DVAL_P(result), overflow);
 -                      Z_TYPE_INFO_P(result) = overflow ? IS_DOUBLE : IS_LONG;
 -                      ZEND_VM_NEXT_OPCODE();
 -              } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
 -                      result = EX_VAR(opline->result.var);
 -                      ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) * Z_DVAL_P(op2));
 -                      ZEND_VM_NEXT_OPCODE();
 -              }
 -      } else if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_DOUBLE)) {
 -              if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_DOUBLE)) {
 -                      result = EX_VAR(opline->result.var);
 -                      ZVAL_DOUBLE(result, Z_DVAL_P(op1) * Z_DVAL_P(op2));
 -                      ZEND_VM_NEXT_OPCODE();
 -              } else if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
 -                      result = EX_VAR(opline->result.var);
 -                      ZVAL_DOUBLE(result, Z_DVAL_P(op1) * ((double)Z_LVAL_P(op2)));
 -                      ZEND_VM_NEXT_OPCODE();
 -              }
 +                      HANDLE_EXCEPTION();
 +              } while (0);
        }
  
 -      SAVE_OPLINE();
 -      if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
 -              op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
 -      }
 -      if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
 -              op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
 -      }
 -      mul_function(EX_VAR(opline->result.var), op1, op2);
 +      object = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
  
 -      zval_ptr_dtor_nogc(free_op2);
 -      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 -}
 +      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DIV_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -      USE_OPLINE
 -      zend_free_op free_op2;
 -      zval *op1, *op2;
 +              HANDLE_EXCEPTION();
 +      }
  
 -      SAVE_OPLINE();
 -      op1 = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var);
 -      op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 -      fast_div_function(EX_VAR(opline->result.var), op1, op2);
 +      if (IS_CV != IS_UNUSED) {
 +              do {
 +                      if (IS_CV == IS_CONST || UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) {
 +                              if ((IS_CV & (IS_VAR|IS_CV)) && EXPECTED(Z_ISREF_P(object))) {
 +                                      object = Z_REFVAL_P(object);
 +                                      if (EXPECTED(Z_TYPE_P(object) == IS_OBJECT)) {
 +                                              break;
 +                                      }
 +                              }
 +                              if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
 +                                      object = GET_OP1_UNDEF_CV(object, BP_VAR_R);
 +                                      if (UNEXPECTED(EG(exception) != NULL)) {
  
 -      zval_ptr_dtor_nogc(free_op2);
 -      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 -}
 +                                              HANDLE_EXCEPTION();
 +                                      }
 +                              }
 +                              zend_throw_error(NULL, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_MOD_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -      USE_OPLINE
 -      zend_free_op free_op2;
 -      zval *op1, *op2, *result;
  
 -      op1 = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
 -      op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 -      if (EXPECTED(Z_TYPE_INFO_P(op1) == IS_LONG)) {
 -              if (EXPECTED(Z_TYPE_INFO_P(op2) == IS_LONG)) {
 -                      result = EX_VAR(opline->result.var);
 -                      if (UNEXPECTED(Z_LVAL_P(op2) == 0)) {
 -                              SAVE_OPLINE();
 -                              zend_throw_exception_ex(zend_ce_division_by_zero_error, 0, "Modulo by zero");
                                HANDLE_EXCEPTION();
 -                      } else if (UNEXPECTED(Z_LVAL_P(op2) == -1)) {
 -                              /* Prevent overflow error/crash if op1==ZEND_LONG_MIN */
 -                              ZVAL_LONG(result, 0);
 -                      } else {
 -                              ZVAL_LONG(result, Z_LVAL_P(op1) % Z_LVAL_P(op2));
                        }
 -                      ZEND_VM_NEXT_OPCODE();
 -              }
 -      }
 -
 -      SAVE_OPLINE();
 -      if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op1) == IS_UNDEF)) {
 -              op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
 -      }
 -      if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(op2) == IS_UNDEF)) {
 -              op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
 +              } while (0);
        }
 -      mod_function(EX_VAR(opline->result.var), op1, op2);
 -
 -      zval_ptr_dtor_nogc(free_op2);
 -      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 -}
 -
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SL_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -      USE_OPLINE
 -      zend_free_op free_op2;
 -      zval *op1, *op2;
 -
 -      SAVE_OPLINE();
 -      op1 = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var);
 -      op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 -      shift_left_function(EX_VAR(opline->result.var), op1, op2);
 -
 -      zval_ptr_dtor_nogc(free_op2);
 -      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 -}
 -
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SR_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -      USE_OPLINE
 -      zend_free_op free_op2;
 -      zval *op1, *op2;
  
 -      SAVE_OPLINE();
 -      op1 = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var);
 -      op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 -      shift_right_function(EX_VAR(opline->result.var), op1, op2);
 +      obj = Z_OBJ_P(object);
 +      called_scope = obj->ce;
  
 -      zval_ptr_dtor_nogc(free_op2);
 -      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 -}
 +      if (IS_CV != IS_CONST ||
 +          UNEXPECTED((fbc = CACHED_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(function_name), called_scope)) == NULL)) {
 +          zend_object *orig_obj = obj;
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_POW_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -      USE_OPLINE
 -      zend_free_op free_op2;
 -      zval *op1, *op2;
 +              if (UNEXPECTED(obj->handlers->get_method == NULL)) {
 +                      zend_throw_error(NULL, "Object does not support method calls");
  
 -      SAVE_OPLINE();
 -      op1 = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var);
 -      op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 -      pow_function(EX_VAR(opline->result.var), op1, op2);
  
 -      zval_ptr_dtor_nogc(free_op2);
 -      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 -}
 +                      HANDLE_EXCEPTION();
 +              }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -      USE_OPLINE
 -      zend_free_op free_op2;
 -      zval *op1, *op2;
 +              /* First, locate the function. */
 +              fbc = obj->handlers->get_method(&obj, Z_STR_P(function_name), ((IS_CV == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL));
 +              if (UNEXPECTED(fbc == NULL)) {
 +                      if (EXPECTED(!EG(exception))) {
 +                              zend_throw_error(NULL, "Call to undefined method %s::%s()", ZSTR_VAL(obj->ce->name), Z_STRVAL_P(function_name));
 +                      }
  
 -      SAVE_OPLINE();
 -      op1 = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
 -      op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
  
 -      do {
 -              if ((IS_CV == IS_CONST || EXPECTED(Z_TYPE_P(op1) == IS_STRING)) &&
 -                  ((IS_TMP_VAR|IS_VAR) == IS_CONST || EXPECTED(Z_TYPE_P(op2) == IS_STRING))) {
 -                      zend_string *op1_str = Z_STR_P(op1);
 -                      zend_string *op2_str = Z_STR_P(op2);
 -                      zend_string *str;
 +                      HANDLE_EXCEPTION();
 +              }
 +              if (IS_CV == IS_CONST &&
 +                  EXPECTED(fbc->type <= ZEND_USER_FUNCTION) &&
 +                  EXPECTED(!(fbc->common.fn_flags & (ZEND_ACC_CALL_VIA_TRAMPOLINE|ZEND_ACC_NEVER_CACHE))) &&
 +                  EXPECTED(obj == orig_obj)) {
 +                      CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(function_name), called_scope, fbc);
 +              }
 +              if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&fbc->op_array);
 +              }
 +      }
  
 -                      if (IS_CV != IS_CONST) {
 -                              if (UNEXPECTED(ZSTR_LEN(op1_str) == 0)) {
 -                                      ZVAL_STR_COPY(EX_VAR(opline->result.var), op2_str);
 +      call_info = ZEND_CALL_NESTED_FUNCTION;
 +      if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_STATIC) != 0)) {
 +              obj = NULL;
 +      } else if (IS_CV & (IS_VAR|IS_TMP_VAR|IS_CV)) {
 +              /* CV may be changed indirectly (e.g. when it's a reference) */
 +              call_info = ZEND_CALL_NESTED_FUNCTION | ZEND_CALL_RELEASE_THIS;
 +              GC_REFCOUNT(obj)++; /* For $this pointer */
 +      }
  
 -                                      break;
 -                              }
 -                      }
 -                      if ((IS_TMP_VAR|IS_VAR) != IS_CONST) {
 -                              if (UNEXPECTED(ZSTR_LEN(op2_str) == 0)) {
 -                                      ZVAL_STR_COPY(EX_VAR(opline->result.var), op1_str);
 -                                      break;
 -                              }
 -                      }
 -                      if (IS_CV != IS_CONST && IS_CV != IS_CV &&
 -                          !ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
 -                          size_t len = ZSTR_LEN(op1_str);
++      if ((IS_CV & (IS_VAR|IS_TMP_VAR)) && UNEXPECTED(EG(exception))) {
++              HANDLE_EXCEPTION();
++      }
 -                              str = zend_string_realloc(op1_str, len + ZSTR_LEN(op2_str), 0);
 -                              memcpy(ZSTR_VAL(str) + len, ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);
 -                              ZVAL_NEW_STR(EX_VAR(opline->result.var), str);
 -                              break;
 -                      } else {
 -                              str = zend_string_alloc(ZSTR_LEN(op1_str) + ZSTR_LEN(op2_str), 0);
 -                              memcpy(ZSTR_VAL(str), ZSTR_VAL(op1_str), ZSTR_LEN(op1_str));
 -                              memcpy(ZSTR_VAL(str) + ZSTR_LEN(op1_str), ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);
 -                              ZVAL_NEW_STR(EX_VAR(opline->result.var), str);
 -                      }
 -              } else {
 -                      if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
 -                              op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
 -                      }
 -                      if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
 -                              op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
 -                      }
 -                      concat_function(EX_VAR(opline->result.var), op1, op2);
 -              }
 +      call = zend_vm_stack_push_call_frame(call_info,
 +              fbc, opline->extended_value, called_scope, obj);
 +      call->prev_execute_data = EX(call);
 +      EX(call) = call;
  
 -      } while (0);
 -      zval_ptr_dtor_nogc(free_op2);
--      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
++      ZEND_VM_NEXT_OPCODE();
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_EQUAL_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
        USE_OPLINE
 -      zend_free_op free_op2;
 +
        zval *op1, *op2, *result;
  
        op1 = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
@@@ -48086,3349 -39573,317 +48210,3353 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
                }
        }
  
 -      /* here we are sure we are dealing with an object */
 -      do {
 -              zend_object *zobj = Z_OBJ_P(container);
 -              zval *retval;
 +      zval_ptr_dtor_nogc(free_op2);
  
 -              if ((IS_TMP_VAR|IS_VAR) == IS_CONST &&
 -                      EXPECTED(zobj->ce == CACHED_PTR(Z_CACHE_SLOT_P(offset)))) {
 -                      uint32_t prop_offset = (uint32_t)(intptr_t)CACHED_PTR(Z_CACHE_SLOT_P(offset) + sizeof(void*));
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
  
 -                      if (EXPECTED(prop_offset != (uint32_t)ZEND_DYNAMIC_PROPERTY_OFFSET)) {
 -                              retval = OBJ_PROP(zobj, prop_offset);
 -                              if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) {
 -                                      ZVAL_COPY(EX_VAR(opline->result.var), retval);
 -                                      break;
 -                              }
 -                      } else if (EXPECTED(zobj->properties != NULL)) {
 -                              retval = zend_hash_find(zobj->properties, Z_STR_P(offset));
 -                              if (EXPECTED(retval)) {
 -                                      ZVAL_COPY(EX_VAR(opline->result.var), retval);
 -                                      break;
 -                              }
 -                      }
 -              }
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_ADD_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
  
 -              if (UNEXPECTED(zobj->handlers->read_property == NULL)) {
 -fetch_obj_is_no_object:
 -                      ZVAL_NULL(EX_VAR(opline->result.var));
 -              } else {
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
  
 -                      retval = zobj->handlers->read_property(container, offset, BP_VAR_IS, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL), EX_VAR(opline->result.var));
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_ADD_SPEC_CV_TMPVAR_DIM_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
  
 -                      if (retval != EX_VAR(opline->result.var)) {
 -                              ZVAL_COPY(EX_VAR(opline->result.var), retval);
 -                      }
 -              }
 -      } while (0);
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
  
 -      zval_ptr_dtor_nogc(free_op2);
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_ADD_SPEC_CV_TMPVAR_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
  
 -      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(add_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SUB_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
        USE_OPLINE
 -      zval *container;
  
 -      if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) {
 -              /* Behave like FETCH_OBJ_W */
 -              zend_free_op free_op1, free_op2;
 -              zval *property;
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
  
 -              SAVE_OPLINE();
 -              property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 -              container = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SUB_SPEC_CV_TMPVAR_DIM_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
  
 -              if (IS_CV == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) {
 -                      zend_throw_error(NULL, "Using $this when not in object context");
 -                      zval_ptr_dtor_nogc(free_op2);
 -                      HANDLE_EXCEPTION();
 -              }
 -              if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) {
 -                      zend_throw_error(NULL, "Cannot use temporary expression in write context");
 -                      zval_ptr_dtor_nogc(free_op2);
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
  
 -                      HANDLE_EXCEPTION();
 -              }
 -              if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) {
 -                      zend_throw_error(NULL, "Cannot use string offset as an object");
 -                      zval_ptr_dtor_nogc(free_op2);
 -                      HANDLE_EXCEPTION();
 -              }
 -              zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W);
 -              zval_ptr_dtor_nogc(free_op2);
 -              if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) {
 -                      EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0);
 -              }
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SUB_SPEC_CV_TMPVAR_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
  
 -              ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 -      } else {
 -              ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU));
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
        }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(sub_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_UNSET_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_MUL_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
        USE_OPLINE
 -      zend_free_op free_op1, free_op2;
 -      zval *container, *property;
 -
 -      SAVE_OPLINE();
 -      container = _get_zval_ptr_cv_BP_VAR_UNSET(execute_data, opline->op1.var);
  
 -      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) {
 -              zend_throw_error(NULL, "Using $this when not in object context");
 -              zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 -              HANDLE_EXCEPTION();
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
        }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
  
 -      property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_MUL_SPEC_CV_TMPVAR_DIM_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
  
 -      if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) {
 -              zend_throw_error(NULL, "Cannot use string offset as an object");
 -              zval_ptr_dtor_nogc(free_op2);
 -              HANDLE_EXCEPTION();
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
        }
 -      zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_UNSET);
 -      zval_ptr_dtor_nogc(free_op2);
 -      if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) {
 -              EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0);
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
        }
 -
 -      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_MUL_SPEC_CV_TMPVAR_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
        USE_OPLINE
 -      zend_free_op free_op2;
 -      zval *object;
 -      zval *property_name;
 -
 -      SAVE_OPLINE();
 -      object = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
  
 -      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_OBJ_P(object) == NULL)) {
 -              zend_throw_error(NULL, "Using $this when not in object context");
 -              zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 -              HANDLE_EXCEPTION();
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
        }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(mul_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
  
 -      property_name = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIV_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
  
 -      if (IS_CV == IS_VAR && UNEXPECTED(object == NULL)) {
 -              zend_throw_error(NULL, "Cannot use string offset as an array");
 -              zval_ptr_dtor_nogc(free_op2);
 -              HANDLE_EXCEPTION();
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
        }
 -      zend_assign_to_object(UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL, object, IS_CV, property_name, (IS_TMP_VAR|IS_VAR), (opline+1)->op1_type, (opline+1)->op1, execute_data, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL));
 -      zval_ptr_dtor_nogc(free_op2);
 -
 -      /* assign_obj has two opcodes! */
 -      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIV_SPEC_CV_TMPVAR_DIM_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
        USE_OPLINE
  
 -      zval *object_ptr;
 -      zend_free_op free_op2, free_op_data1;
 -      zval *value;
 -      zval *variable_ptr;
 -      zval *dim;
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
  
 -      SAVE_OPLINE();
 -      object_ptr = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIV_SPEC_CV_TMPVAR_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
  
 -      if (IS_CV == IS_VAR && UNEXPECTED(object_ptr == NULL)) {
 -              zend_throw_error(NULL, "Cannot use string offset as an array");
 -              FREE_UNFETCHED_OP((opline+1)->op1_type, (opline+1)->op1.var);
 -              zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 -              HANDLE_EXCEPTION();
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
        }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(div_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
  
 -      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 -try_assign_dim_array:
 -              if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED) {
 -                      SEPARATE_ARRAY(object_ptr);
 -                      variable_ptr = zend_hash_next_index_insert(Z_ARRVAL_P(object_ptr), &EG(uninitialized_zval));
 -                      if (UNEXPECTED(variable_ptr == NULL)) {
 -                              zend_error(E_WARNING, "Cannot add element to the array as the next element is already occupied");
 -                              variable_ptr = &EG(error_zval);
 -                      }
 -              } else {
 -                      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 -                      SEPARATE_ARRAY(object_ptr);
 -                      variable_ptr = zend_fetch_dimension_address_inner(Z_ARRVAL_P(object_ptr), dim, (IS_TMP_VAR|IS_VAR), BP_VAR_W);
 -                      zval_ptr_dtor_nogc(free_op2);
 -              }
 -              value = get_zval_ptr_r((opline+1)->op1_type, (opline+1)->op1, execute_data, &free_op_data1);
 -              if (UNEXPECTED(variable_ptr == &EG(error_zval))) {
 -                      FREE_OP(free_op_data1);
 -                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 -                              ZVAL_NULL(EX_VAR(opline->result.var));
 -                      }
 -              } else {
 -                      value = zend_assign_to_variable(variable_ptr, value, (opline+1)->op1_type);
 -                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 -                              ZVAL_COPY(EX_VAR(opline->result.var), value);
 -                      }
 -              }
 -      } else {
 -              if (EXPECTED(Z_ISREF_P(object_ptr))) {
 -                      object_ptr = Z_REFVAL_P(object_ptr);
 -                      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 -                              goto try_assign_dim_array;
 -                      }
 -              }
 -              if (EXPECTED(Z_TYPE_P(object_ptr) == IS_OBJECT)) {
 -                      zend_free_op free_op2;
 -                      zval *property_name = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_MOD_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
  
 -                      zend_assign_to_object_dim(UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL, object_ptr, property_name, (opline+1)->op1_type, (opline+1)->op1, execute_data);
 -                      zval_ptr_dtor_nogc(free_op2);
 -              } else if (EXPECTED(Z_TYPE_P(object_ptr) == IS_STRING)) {
 -                      if (EXPECTED(Z_STRLEN_P(object_ptr) != 0)) {
 -                              if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED) {
 -                                      zend_throw_error(NULL, "[] operator not supported for strings");
 -                                      FREE_UNFETCHED_OP((opline+1)->op1_type, (opline+1)->op1.var);
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
  
 -                                      HANDLE_EXCEPTION();
 -                              } else {
 -                                      zend_long offset;
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_MOD_SPEC_CV_TMPVAR_DIM_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
  
 -                                      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 -                                      offset = zend_fetch_string_offset(object_ptr, dim, BP_VAR_W);
 -                                      zval_ptr_dtor_nogc(free_op2);
 -                                      value = get_zval_ptr_r_deref((opline+1)->op1_type, (opline+1)->op1, execute_data, &free_op_data1);
 -                                      zend_assign_to_string_offset(object_ptr, offset, value, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL));
 -                                      FREE_OP(free_op_data1);
 -                              }
 -                      } else {
 -                              zval_ptr_dtor_nogc(object_ptr);
 -assign_dim_convert_to_array:
 -                              ZVAL_NEW_ARR(object_ptr);
 -                              zend_hash_init(Z_ARRVAL_P(object_ptr), 8, NULL, ZVAL_PTR_DTOR, 0);
 -                              goto try_assign_dim_array;
 -                      }
 -              } else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
 -                      if (IS_CV == IS_VAR && UNEXPECTED(object_ptr == &EG(error_zval))) {
 -                              goto assign_dim_clean;
 -                      }
 -                      goto assign_dim_convert_to_array;
 -              } else {
 -                      zend_error(E_WARNING, "Cannot use a scalar value as an array");
 -assign_dim_clean:
 -                      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 -                      zval_ptr_dtor_nogc(free_op2);
 -                      value = get_zval_ptr_r((opline+1)->op1_type, (opline+1)->op1, execute_data, &free_op_data1);
 -                      FREE_OP(free_op_data1);
 -                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 -                              ZVAL_NULL(EX_VAR(opline->result.var));
 -                      }
 -              }
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
        }
 -
 -      /* assign_dim has two opcodes! */
 -      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FAST_CONCAT_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_MOD_SPEC_CV_TMPVAR_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
        USE_OPLINE
 -      zend_free_op free_op2;
 -      zval *op1, *op2;
 -      zend_string *op1_str, *op2_str, *str;
  
 -      SAVE_OPLINE();
 -      op1 = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
 -      if (IS_CV == IS_CONST) {
 -              op1_str = Z_STR_P(op1);
 -      } else if (EXPECTED(Z_TYPE_P(op1) == IS_STRING)) {
 -              op1_str = zend_string_copy(Z_STR_P(op1));
 -      } else {
 -              if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
 -                      GET_OP1_UNDEF_CV(op1, BP_VAR_R);
 -              }
 -              op1_str = _zval_get_string_func(op1);
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
        }
 -      op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 -      if ((IS_TMP_VAR|IS_VAR) == IS_CONST) {
 -              op2_str = Z_STR_P(op2);
 -      } else if (EXPECTED(Z_TYPE_P(op2) == IS_STRING)) {
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(mod_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SL_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SL_SPEC_CV_TMPVAR_DIM_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SL_SPEC_CV_TMPVAR_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(shift_left_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SR_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SR_SPEC_CV_TMPVAR_DIM_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_SR_SPEC_CV_TMPVAR_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(shift_right_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_CONCAT_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_CONCAT_SPEC_CV_TMPVAR_DIM_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_CONCAT_SPEC_CV_TMPVAR_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(concat_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_BW_OR_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_BW_OR_SPEC_CV_TMPVAR_DIM_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_BW_OR_SPEC_CV_TMPVAR_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_or_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_BW_AND_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_BW_AND_SPEC_CV_TMPVAR_DIM_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_BW_AND_SPEC_CV_TMPVAR_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_and_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_BW_XOR_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_BW_XOR_SPEC_CV_TMPVAR_DIM_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_BW_XOR_SPEC_CV_TMPVAR_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(bitwise_xor_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_POW_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_POW_SPEC_CV_TMPVAR_DIM_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(1)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_POW_SPEC_CV_TMPVAR_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +#if 0 || ((IS_TMP_VAR|IS_VAR) != IS_UNUSED)
 +      USE_OPLINE
 +
 +# if 0 || (IS_CV != IS_UNUSED)
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_helper_SPEC_CV_TMPVAR(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +      if (EXPECTED(0)) {
 +              ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +      }
 +# endif
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#else
 +      ZEND_VM_TAIL_CALL(zend_binary_assign_op_dim_helper_SPEC_CV_TMPVAR(pow_function ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +#endif
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPEC_CV_TMPVAR(int inc ZEND_OPCODE_HANDLER_ARGS_DC)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2;
 +      zval *object;
 +      zval *property;
 +      zval *zptr;
 +
 +      SAVE_OPLINE();
 +      object = _get_zval_ptr_cv_BP_VAR_RW(execute_data, opline->op1.var);
 +
 +      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 +              HANDLE_EXCEPTION();
 +      }
 +
 +      property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +
 +      do {
 +              if (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) {
 +                      ZVAL_DEREF(object);
 +                      if (UNEXPECTED(!make_real_object(object))) {
 +                              zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
 +                              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                      ZVAL_NULL(EX_VAR(opline->result.var));
 +                              }
 +                              break;
 +                      }
 +              }
 +
 +              /* here we are sure we are dealing with an object */
 +              if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr)
 +                      && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) {
 +                      if (UNEXPECTED(Z_ISERROR_P(zptr))) {
 +                              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                      ZVAL_NULL(EX_VAR(opline->result.var));
 +                              }
 +                      } else {
 +                              if (EXPECTED(Z_TYPE_P(zptr) == IS_LONG)) {
 +                                      if (inc) {
 +                                              fast_long_increment_function(zptr);
 +                                      } else {
 +                                              fast_long_decrement_function(zptr);
 +                                      }
 +                              } else {
 +                                      ZVAL_DEREF(zptr);
 +                                      SEPARATE_ZVAL_NOREF(zptr);
 +
 +                                      if (inc) {
 +                                              increment_function(zptr);
 +                                      } else {
 +                                              decrement_function(zptr);
 +                                      }
 +                              }
 +                              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                      ZVAL_COPY(EX_VAR(opline->result.var), zptr);
 +                              }
 +                      }
 +              } else {
 +                      zend_pre_incdec_overloaded_property(object, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL));
 +              }
 +      } while (0);
 +
 +      zval_ptr_dtor_nogc(free_op2);
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_PRE_INC_OBJ_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      ZEND_VM_TAIL_CALL(zend_pre_incdec_property_helper_SPEC_CV_TMPVAR(1 ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_PRE_DEC_OBJ_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      ZEND_VM_TAIL_CALL(zend_pre_incdec_property_helper_SPEC_CV_TMPVAR(0 ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SPEC_CV_TMPVAR(int inc ZEND_OPCODE_HANDLER_ARGS_DC)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2;
 +      zval *object;
 +      zval *property;
 +      zval *zptr;
 +
 +      SAVE_OPLINE();
 +      object = _get_zval_ptr_cv_BP_VAR_RW(execute_data, opline->op1.var);
 +
 +      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 +              HANDLE_EXCEPTION();
 +      }
 +
 +      property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +
 +      do {
 +              if (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) {
 +                      ZVAL_DEREF(object);
 +                      if (UNEXPECTED(!make_real_object(object))) {
 +                              zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
 +                              ZVAL_NULL(EX_VAR(opline->result.var));
 +                              break;
 +                      }
 +              }
 +
 +              /* here we are sure we are dealing with an object */
 +
 +              if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr)
 +                      && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) {
 +                      if (UNEXPECTED(Z_ISERROR_P(zptr))) {
 +                              ZVAL_NULL(EX_VAR(opline->result.var));
 +                      } else {
 +                              if (EXPECTED(Z_TYPE_P(zptr) == IS_LONG)) {
 +                                      ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr);
 +                                      if (inc) {
 +                                              fast_long_increment_function(zptr);
 +                                      } else {
 +                                              fast_long_decrement_function(zptr);
 +                                      }
 +                              } else {
 +                                      ZVAL_DEREF(zptr);
 +                                      ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr);
 +                                      zval_opt_copy_ctor(zptr);
 +                                      if (inc) {
 +                                              increment_function(zptr);
 +                                      } else {
 +                                              decrement_function(zptr);
 +                                      }
 +                              }
 +                      }
 +              } else {
 +                      zend_post_incdec_overloaded_property(object, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, EX_VAR(opline->result.var));
 +              }
 +      } while (0);
 +
 +      zval_ptr_dtor_nogc(free_op2);
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_POST_INC_OBJ_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      ZEND_VM_TAIL_CALL(zend_post_incdec_property_helper_SPEC_CV_TMPVAR(1 ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_POST_DEC_OBJ_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      ZEND_VM_TAIL_CALL(zend_post_incdec_property_helper_SPEC_CV_TMPVAR(0 ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2;
 +      zval *container, *dim, *value, *result;
 +
 +      SAVE_OPLINE();
 +      container = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
 +      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +      if (IS_CV != IS_CONST) {
 +              if (EXPECTED(Z_TYPE_P(container) == IS_ARRAY)) {
 +fetch_dim_r_array:
 +                      value = zend_fetch_dimension_address_inner(Z_ARRVAL_P(container), dim, (IS_TMP_VAR|IS_VAR), BP_VAR_R);
 +                      result = EX_VAR(opline->result.var);
 +                      ZVAL_COPY_UNREF(result, value);
 +              } else if (EXPECTED(Z_TYPE_P(container) == IS_REFERENCE)) {
 +                      container = Z_REFVAL_P(container);
 +                      if (EXPECTED(Z_TYPE_P(container) == IS_ARRAY)) {
 +                              goto fetch_dim_r_array;
 +                      } else {
 +                              goto fetch_dim_r_slow;
 +                      }
 +              } else {
 +fetch_dim_r_slow:
 +                      result = EX_VAR(opline->result.var);
 +                      zend_fetch_dimension_address_read_R_slow(result, container, dim);
 +              }
 +      } else {
 +              result = EX_VAR(opline->result.var);
 +              zend_fetch_dimension_address_read_R(result, container, dim, (IS_TMP_VAR|IS_VAR));
 +      }
 +      zval_ptr_dtor_nogc(free_op2);
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_W_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1, free_op2;
 +      zval *container;
 +
 +      SAVE_OPLINE();
 +      container = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
 +
 +      zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2), (IS_TMP_VAR|IS_VAR));
 +      zval_ptr_dtor_nogc(free_op2);
 +      if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) {
 +              EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
 +      }
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_RW_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1, free_op2;
 +      zval *container;
 +
 +      SAVE_OPLINE();
 +      container = _get_zval_ptr_cv_undef_BP_VAR_RW(execute_data, opline->op1.var);
 +
 +      zend_fetch_dimension_address_RW(EX_VAR(opline->result.var), container, _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2), (IS_TMP_VAR|IS_VAR));
 +      zval_ptr_dtor_nogc(free_op2);
 +      if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) {
 +              EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
 +      }
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2;
 +      zval *container;
 +
 +      SAVE_OPLINE();
 +      container = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
 +      zend_fetch_dimension_address_read_IS(EX_VAR(opline->result.var), container, _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2), (IS_TMP_VAR|IS_VAR));
 +      zval_ptr_dtor_nogc(free_op2);
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zval *container;
 +      zend_free_op free_op1, free_op2;
 +
 +      SAVE_OPLINE();
 +
 +      if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) {
 +        if ((IS_CV & (IS_CONST|IS_TMP_VAR))) {
 +            zend_throw_error(NULL, "Cannot use temporary expression in write context");
 +                      zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 +
 +                      HANDLE_EXCEPTION();
 +        }
 +              container = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
 +              zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2), (IS_TMP_VAR|IS_VAR));
 +              if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) {
 +                      EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
 +              }
 +              zval_ptr_dtor_nogc(free_op2);
 +
 +      } else {
 +              if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED) {
 +                      zend_throw_error(NULL, "Cannot use [] for reading");
 +                      zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 +
 +                      HANDLE_EXCEPTION();
 +              }
 +              container = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
 +              zend_fetch_dimension_address_read_R(EX_VAR(opline->result.var), container, _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2), (IS_TMP_VAR|IS_VAR));
 +              zval_ptr_dtor_nogc(free_op2);
 +
 +      }
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_UNSET_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1, free_op2;
 +      zval *container;
 +
 +      SAVE_OPLINE();
 +      container = _get_zval_ptr_cv_undef_BP_VAR_UNSET(execute_data, opline->op1.var);
 +
 +      zend_fetch_dimension_address_UNSET(EX_VAR(opline->result.var), container, _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2), (IS_TMP_VAR|IS_VAR));
 +      zval_ptr_dtor_nogc(free_op2);
 +      if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) {
 +              EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
 +      }
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +
 +      zval *container;
 +      zend_free_op free_op2;
 +      zval *offset;
 +
 +      SAVE_OPLINE();
 +      container = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var);
 +
 +      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 +              HANDLE_EXCEPTION();
 +      }
 +
 +      offset = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +
 +      if (IS_CV == IS_CONST ||
 +          (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT))) {
 +              if ((IS_CV & (IS_VAR|IS_CV)) && Z_ISREF_P(container)) {
 +                      container = Z_REFVAL_P(container);
 +                      if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT)) {
 +                              goto fetch_obj_r_no_object;
 +                      }
 +              } else {
 +                      goto fetch_obj_r_no_object;
 +              }
 +      }
 +
 +      /* here we are sure we are dealing with an object */
 +      do {
 +              zend_object *zobj = Z_OBJ_P(container);
 +              zval *retval;
 +
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CONST &&
 +                      EXPECTED(zobj->ce == CACHED_PTR(Z_CACHE_SLOT_P(offset)))) {
 +                      uint32_t prop_offset = (uint32_t)(intptr_t)CACHED_PTR(Z_CACHE_SLOT_P(offset) + sizeof(void*));
 +
 +                      if (EXPECTED(prop_offset != (uint32_t)ZEND_DYNAMIC_PROPERTY_OFFSET)) {
 +                              retval = OBJ_PROP(zobj, prop_offset);
 +                              if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) {
 +                                      ZVAL_COPY_UNREF(EX_VAR(opline->result.var), retval);
 +                                      break;
 +                              }
 +                      } else if (EXPECTED(zobj->properties != NULL)) {
 +                              retval = zend_hash_find(zobj->properties, Z_STR_P(offset));
 +                              if (EXPECTED(retval)) {
 +                                      ZVAL_COPY_UNREF(EX_VAR(opline->result.var), retval);
 +                                      break;
 +                              }
 +                      }
 +              }
 +
 +              if (UNEXPECTED(zobj->handlers->read_property == NULL)) {
 +fetch_obj_r_no_object:
 +                      zend_error(E_NOTICE, "Trying to get property of non-object");
 +                      ZVAL_NULL(EX_VAR(opline->result.var));
 +              } else {
 +                      retval = zobj->handlers->read_property(container, offset, BP_VAR_R, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL), EX_VAR(opline->result.var));
 +
 +                      if (retval != EX_VAR(opline->result.var)) {
 +                              ZVAL_COPY_UNREF(EX_VAR(opline->result.var), retval);
 +                      }
 +              }
 +      } while (0);
 +
 +      zval_ptr_dtor_nogc(free_op2);
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1, free_op2;
 +      zval *property;
 +      zval *container;
 +
 +      SAVE_OPLINE();
 +      property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +
 +      container = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
 +      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              zval_ptr_dtor_nogc(free_op2);
 +              HANDLE_EXCEPTION();
 +      }
 +
 +      zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W);
 +      zval_ptr_dtor_nogc(free_op2);
 +      if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) {
 +              EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
 +      }
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1, free_op2;
 +      zval *property;
 +      zval *container;
 +
 +      SAVE_OPLINE();
 +      property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +      container = _get_zval_ptr_cv_BP_VAR_RW(execute_data, opline->op1.var);
 +
 +      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              zval_ptr_dtor_nogc(free_op2);
 +              HANDLE_EXCEPTION();
 +      }
 +      zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW);
 +      zval_ptr_dtor_nogc(free_op2);
 +      if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) {
 +              EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
 +      }
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +
 +      zval *container;
 +      zend_free_op free_op2;
 +      zval *offset;
 +
 +      SAVE_OPLINE();
 +      container = _get_zval_ptr_cv_BP_VAR_IS(execute_data, opline->op1.var);
 +
 +      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 +              HANDLE_EXCEPTION();
 +      }
 +
 +      offset  = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +
 +      if (IS_CV == IS_CONST ||
 +          (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT))) {
 +              if ((IS_CV & (IS_VAR|IS_CV)) && Z_ISREF_P(container)) {
 +                      container = Z_REFVAL_P(container);
 +                      if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT)) {
 +                              goto fetch_obj_is_no_object;
 +                      }
 +              } else {
 +                      goto fetch_obj_is_no_object;
 +              }
 +      }
 +
 +      /* here we are sure we are dealing with an object */
 +      do {
 +              zend_object *zobj = Z_OBJ_P(container);
 +              zval *retval;
 +
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CONST &&
 +                      EXPECTED(zobj->ce == CACHED_PTR(Z_CACHE_SLOT_P(offset)))) {
 +                      uint32_t prop_offset = (uint32_t)(intptr_t)CACHED_PTR(Z_CACHE_SLOT_P(offset) + sizeof(void*));
 +
 +                      if (EXPECTED(prop_offset != (uint32_t)ZEND_DYNAMIC_PROPERTY_OFFSET)) {
 +                              retval = OBJ_PROP(zobj, prop_offset);
 +                              if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) {
 +                                      ZVAL_COPY(EX_VAR(opline->result.var), retval);
 +                                      break;
 +                              }
 +                      } else if (EXPECTED(zobj->properties != NULL)) {
 +                              retval = zend_hash_find(zobj->properties, Z_STR_P(offset));
 +                              if (EXPECTED(retval)) {
 +                                      ZVAL_COPY(EX_VAR(opline->result.var), retval);
 +                                      break;
 +                              }
 +                      }
 +              }
 +
 +              if (UNEXPECTED(zobj->handlers->read_property == NULL)) {
 +fetch_obj_is_no_object:
 +                      ZVAL_NULL(EX_VAR(opline->result.var));
 +              } else {
 +
 +                      retval = zobj->handlers->read_property(container, offset, BP_VAR_IS, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL), EX_VAR(opline->result.var));
 +
 +                      if (retval != EX_VAR(opline->result.var)) {
 +                              ZVAL_COPY(EX_VAR(opline->result.var), retval);
 +                      }
 +              }
 +      } while (0);
 +
 +      zval_ptr_dtor_nogc(free_op2);
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zval *container;
 +
 +      if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) {
 +              /* Behave like FETCH_OBJ_W */
 +              zend_free_op free_op1, free_op2;
 +              zval *property;
 +
 +              SAVE_OPLINE();
 +              property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +              container = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
 +
 +              if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_UNDEF)) {
 +                      zend_throw_error(NULL, "Using $this when not in object context");
 +                      zval_ptr_dtor_nogc(free_op2);
 +                      HANDLE_EXCEPTION();
 +              }
 +              if ((IS_CV & (IS_CONST|IS_TMP_VAR))) {
 +                      zend_throw_error(NULL, "Cannot use temporary expression in write context");
 +                      zval_ptr_dtor_nogc(free_op2);
 +
 +                      HANDLE_EXCEPTION();
 +              }
 +              zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W);
 +              zval_ptr_dtor_nogc(free_op2);
 +              if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) {
 +                      EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
 +              }
 +
 +              ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +      } else {
 +              ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU));
 +      }
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_UNSET_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1, free_op2;
 +      zval *container, *property;
 +
 +      SAVE_OPLINE();
 +      container = _get_zval_ptr_cv_BP_VAR_UNSET(execute_data, opline->op1.var);
 +
 +      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 +              HANDLE_EXCEPTION();
 +      }
 +
 +      property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +
 +      zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_UNSET);
 +      zval_ptr_dtor_nogc(free_op2);
 +      if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) {
 +              EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
 +      }
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_LIST_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2;
 +      zval *container;
 +
 +      SAVE_OPLINE();
 +      container = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
 +      zend_fetch_dimension_address_read_LIST(EX_VAR(opline->result.var), container, _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2));
 +      zval_ptr_dtor_nogc(free_op2);
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_DATA_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2;
 +      zval *object, *property_name, *value, tmp;
 +
 +      SAVE_OPLINE();
 +      object = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
 +
 +      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 +              HANDLE_EXCEPTION();
 +      }
 +
 +      property_name = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +      value = EX_CONSTANT((opline+1)->op1);
 +
 +      if (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) {
 +              do {
 +                      if (Z_ISREF_P(object)) {
 +                              object = Z_REFVAL_P(object);
 +                              if (EXPECTED(Z_TYPE_P(object) == IS_OBJECT)) {
 +                                      break;
 +                              }
 +                      }
 +                      if (EXPECTED(Z_TYPE_P(object) <= IS_FALSE ||
 +                          (Z_TYPE_P(object) == IS_STRING && Z_STRLEN_P(object) == 0))) {
 +                              zend_object *obj;
 +
 +                              zval_ptr_dtor(object);
 +                              object_init(object);
 +                              Z_ADDREF_P(object);
 +                              obj = Z_OBJ_P(object);
 +                              zend_error(E_WARNING, "Creating default object from empty value");
 +                              if (GC_REFCOUNT(obj) == 1) {
 +                                      /* the enclosing container was deleted, obj is unreferenced */
 +                                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                              ZVAL_NULL(EX_VAR(opline->result.var));
 +                                      }
 +
 +                                      OBJ_RELEASE(obj);
 +                                      goto exit_assign_obj;
 +                              }
 +                              Z_DELREF_P(object);
 +                      } else {
 +                              if (IS_CV != IS_VAR || EXPECTED(!Z_ISERROR_P(object))) {
 +                                      zend_error(E_WARNING, "Attempt to assign property of non-object");
 +                              }
 +                              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                      ZVAL_NULL(EX_VAR(opline->result.var));
 +                              }
 +
 +                              goto exit_assign_obj;
 +                      }
 +              } while (0);
 +      }
 +
 +      if ((IS_TMP_VAR|IS_VAR) == IS_CONST &&
 +          EXPECTED(Z_OBJCE_P(object) == CACHED_PTR(Z_CACHE_SLOT_P(property_name)))) {
 +              uint32_t prop_offset = (uint32_t)(intptr_t)CACHED_PTR(Z_CACHE_SLOT_P(property_name) + sizeof(void*));
 +              zend_object *zobj = Z_OBJ_P(object);
 +              zval *property;
 +
 +              if (EXPECTED(prop_offset != (uint32_t)ZEND_DYNAMIC_PROPERTY_OFFSET)) {
 +                      property = OBJ_PROP(zobj, prop_offset);
 +                      if (Z_TYPE_P(property) != IS_UNDEF) {
 +fast_assign_obj:
 +                              value = zend_assign_to_variable(property, value, IS_CONST);
 +                              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                              }
 +                              goto exit_assign_obj;
 +                      }
 +              } else {
 +                      if (EXPECTED(zobj->properties != NULL)) {
 +                              if (UNEXPECTED(GC_REFCOUNT(zobj->properties) > 1)) {
 +                                      if (EXPECTED(!(GC_FLAGS(zobj->properties) & IS_ARRAY_IMMUTABLE))) {
 +                                              GC_REFCOUNT(zobj->properties)--;
 +                                      }
 +                                      zobj->properties = zend_array_dup(zobj->properties);
 +                              }
 +                              property = zend_hash_find(zobj->properties, Z_STR_P(property_name));
 +                              if (property) {
 +                                      goto fast_assign_obj;
 +                              }
 +                      }
 +
 +                      if (!zobj->ce->__set) {
 +
 +                              if (EXPECTED(zobj->properties == NULL)) {
 +                                      rebuild_object_properties(zobj);
 +                              }
 +                              if (IS_CONST == IS_CONST) {
 +                                      if (UNEXPECTED(Z_OPT_REFCOUNTED_P(value))) {
 +                                              Z_ADDREF_P(value);
 +                                      }
 +                              } else if (IS_CONST != IS_TMP_VAR) {
 +                                      if (Z_ISREF_P(value)) {
 +                                              if (IS_CONST == IS_VAR) {
 +                                                      zend_reference *ref = Z_REF_P(value);
 +                                                      if (--GC_REFCOUNT(ref) == 0) {
 +                                                              ZVAL_COPY_VALUE(&tmp, Z_REFVAL_P(value));
 +                                                              efree_size(ref, sizeof(zend_reference));
 +                                                              value = &tmp;
 +                                                      } else {
 +                                                              value = Z_REFVAL_P(value);
 +                                                              if (Z_REFCOUNTED_P(value)) {
 +                                                                      Z_ADDREF_P(value);
 +                                                              }
 +                                                      }
 +                                              } else {
 +                                                      value = Z_REFVAL_P(value);
 +                                                      if (Z_REFCOUNTED_P(value)) {
 +                                                              Z_ADDREF_P(value);
 +                                                      }
 +                                              }
 +                                      } else if (IS_CONST == IS_CV && Z_REFCOUNTED_P(value)) {
 +                                              Z_ADDREF_P(value);
 +                                      }
 +                              }
 +                              zend_hash_add_new(zobj->properties, Z_STR_P(property_name), value);
 +                              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                              }
 +                              goto exit_assign_obj;
 +                      }
 +              }
 +      }
 +
 +      if (!Z_OBJ_HT_P(object)->write_property) {
 +              zend_error(E_WARNING, "Attempt to assign property of non-object");
 +              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                      ZVAL_NULL(EX_VAR(opline->result.var));
 +              }
 +
 +              goto exit_assign_obj;
 +      }
 +
 +      if (IS_CONST == IS_CV || IS_CONST == IS_VAR) {
 +              ZVAL_DEREF(value);
 +      }
 +
 +      Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL);
 +
 +      if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) {
 +              ZVAL_COPY(EX_VAR(opline->result.var), value);
 +      }
 +
 +exit_assign_obj:
 +      zval_ptr_dtor_nogc(free_op2);
 +
 +      /* assign_obj has two opcodes! */
 +      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_DATA_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2, free_op_data;
 +      zval *object, *property_name, *value, tmp;
 +
 +      SAVE_OPLINE();
 +      object = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
 +
 +      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 +              HANDLE_EXCEPTION();
 +      }
 +
 +      property_name = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +      value = _get_zval_ptr_tmp((opline+1)->op1.var, execute_data, &free_op_data);
 +
 +      if (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) {
 +              do {
 +                      if (Z_ISREF_P(object)) {
 +                              object = Z_REFVAL_P(object);
 +                              if (EXPECTED(Z_TYPE_P(object) == IS_OBJECT)) {
 +                                      break;
 +                              }
 +                      }
 +                      if (EXPECTED(Z_TYPE_P(object) <= IS_FALSE ||
 +                          (Z_TYPE_P(object) == IS_STRING && Z_STRLEN_P(object) == 0))) {
 +                              zend_object *obj;
 +
 +                              zval_ptr_dtor(object);
 +                              object_init(object);
 +                              Z_ADDREF_P(object);
 +                              obj = Z_OBJ_P(object);
 +                              zend_error(E_WARNING, "Creating default object from empty value");
 +                              if (GC_REFCOUNT(obj) == 1) {
 +                                      /* the enclosing container was deleted, obj is unreferenced */
 +                                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                              ZVAL_NULL(EX_VAR(opline->result.var));
 +                                      }
 +                                      zval_ptr_dtor_nogc(free_op_data);
 +                                      OBJ_RELEASE(obj);
 +                                      goto exit_assign_obj;
 +                              }
 +                              Z_DELREF_P(object);
 +                      } else {
 +                              if (IS_CV != IS_VAR || EXPECTED(!Z_ISERROR_P(object))) {
 +                                      zend_error(E_WARNING, "Attempt to assign property of non-object");
 +                              }
 +                              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                      ZVAL_NULL(EX_VAR(opline->result.var));
 +                              }
 +                              zval_ptr_dtor_nogc(free_op_data);
 +                              goto exit_assign_obj;
 +                      }
 +              } while (0);
 +      }
 +
 +      if ((IS_TMP_VAR|IS_VAR) == IS_CONST &&
 +          EXPECTED(Z_OBJCE_P(object) == CACHED_PTR(Z_CACHE_SLOT_P(property_name)))) {
 +              uint32_t prop_offset = (uint32_t)(intptr_t)CACHED_PTR(Z_CACHE_SLOT_P(property_name) + sizeof(void*));
 +              zend_object *zobj = Z_OBJ_P(object);
 +              zval *property;
 +
 +              if (EXPECTED(prop_offset != (uint32_t)ZEND_DYNAMIC_PROPERTY_OFFSET)) {
 +                      property = OBJ_PROP(zobj, prop_offset);
 +                      if (Z_TYPE_P(property) != IS_UNDEF) {
 +fast_assign_obj:
 +                              value = zend_assign_to_variable(property, value, IS_TMP_VAR);
 +                              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                              }
 +                              goto exit_assign_obj;
 +                      }
 +              } else {
 +                      if (EXPECTED(zobj->properties != NULL)) {
 +                              if (UNEXPECTED(GC_REFCOUNT(zobj->properties) > 1)) {
 +                                      if (EXPECTED(!(GC_FLAGS(zobj->properties) & IS_ARRAY_IMMUTABLE))) {
 +                                              GC_REFCOUNT(zobj->properties)--;
 +                                      }
 +                                      zobj->properties = zend_array_dup(zobj->properties);
 +                              }
 +                              property = zend_hash_find(zobj->properties, Z_STR_P(property_name));
 +                              if (property) {
 +                                      goto fast_assign_obj;
 +                              }
 +                      }
 +
 +                      if (!zobj->ce->__set) {
 +
 +                              if (EXPECTED(zobj->properties == NULL)) {
 +                                      rebuild_object_properties(zobj);
 +                              }
 +                              if (IS_TMP_VAR == IS_CONST) {
 +                                      if (UNEXPECTED(Z_OPT_REFCOUNTED_P(value))) {
 +                                              Z_ADDREF_P(value);
 +                                      }
 +                              } else if (IS_TMP_VAR != IS_TMP_VAR) {
 +                                      if (Z_ISREF_P(value)) {
 +                                              if (IS_TMP_VAR == IS_VAR) {
 +                                                      zend_reference *ref = Z_REF_P(value);
 +                                                      if (--GC_REFCOUNT(ref) == 0) {
 +                                                              ZVAL_COPY_VALUE(&tmp, Z_REFVAL_P(value));
 +                                                              efree_size(ref, sizeof(zend_reference));
 +                                                              value = &tmp;
 +                                                      } else {
 +                                                              value = Z_REFVAL_P(value);
 +                                                              if (Z_REFCOUNTED_P(value)) {
 +                                                                      Z_ADDREF_P(value);
 +                                                              }
 +                                                      }
 +                                              } else {
 +                                                      value = Z_REFVAL_P(value);
 +                                                      if (Z_REFCOUNTED_P(value)) {
 +                                                              Z_ADDREF_P(value);
 +                                                      }
 +                                              }
 +                                      } else if (IS_TMP_VAR == IS_CV && Z_REFCOUNTED_P(value)) {
 +                                              Z_ADDREF_P(value);
 +                                      }
 +                              }
 +                              zend_hash_add_new(zobj->properties, Z_STR_P(property_name), value);
 +                              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                              }
 +                              goto exit_assign_obj;
 +                      }
 +              }
 +      }
 +
 +      if (!Z_OBJ_HT_P(object)->write_property) {
 +              zend_error(E_WARNING, "Attempt to assign property of non-object");
 +              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                      ZVAL_NULL(EX_VAR(opline->result.var));
 +              }
 +              zval_ptr_dtor_nogc(free_op_data);
 +              goto exit_assign_obj;
 +      }
 +
 +      if (IS_TMP_VAR == IS_CV || IS_TMP_VAR == IS_VAR) {
 +              ZVAL_DEREF(value);
 +      }
 +
 +      Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL);
 +
 +      if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) {
 +              ZVAL_COPY(EX_VAR(opline->result.var), value);
 +      }
 +      zval_ptr_dtor_nogc(free_op_data);
 +exit_assign_obj:
 +      zval_ptr_dtor_nogc(free_op2);
 +
 +      /* assign_obj has two opcodes! */
 +      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_DATA_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2, free_op_data;
 +      zval *object, *property_name, *value, tmp;
 +
 +      SAVE_OPLINE();
 +      object = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
 +
 +      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 +              HANDLE_EXCEPTION();
 +      }
 +
 +      property_name = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +      value = _get_zval_ptr_var((opline+1)->op1.var, execute_data, &free_op_data);
 +
 +      if (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) {
 +              do {
 +                      if (Z_ISREF_P(object)) {
 +                              object = Z_REFVAL_P(object);
 +                              if (EXPECTED(Z_TYPE_P(object) == IS_OBJECT)) {
 +                                      break;
 +                              }
 +                      }
 +                      if (EXPECTED(Z_TYPE_P(object) <= IS_FALSE ||
 +                          (Z_TYPE_P(object) == IS_STRING && Z_STRLEN_P(object) == 0))) {
 +                              zend_object *obj;
 +
 +                              zval_ptr_dtor(object);
 +                              object_init(object);
 +                              Z_ADDREF_P(object);
 +                              obj = Z_OBJ_P(object);
 +                              zend_error(E_WARNING, "Creating default object from empty value");
 +                              if (GC_REFCOUNT(obj) == 1) {
 +                                      /* the enclosing container was deleted, obj is unreferenced */
 +                                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                              ZVAL_NULL(EX_VAR(opline->result.var));
 +                                      }
 +                                      zval_ptr_dtor_nogc(free_op_data);
 +                                      OBJ_RELEASE(obj);
 +                                      goto exit_assign_obj;
 +                              }
 +                              Z_DELREF_P(object);
 +                      } else {
 +                              if (IS_CV != IS_VAR || EXPECTED(!Z_ISERROR_P(object))) {
 +                                      zend_error(E_WARNING, "Attempt to assign property of non-object");
 +                              }
 +                              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                      ZVAL_NULL(EX_VAR(opline->result.var));
 +                              }
 +                              zval_ptr_dtor_nogc(free_op_data);
 +                              goto exit_assign_obj;
 +                      }
 +              } while (0);
 +      }
 +
 +      if ((IS_TMP_VAR|IS_VAR) == IS_CONST &&
 +          EXPECTED(Z_OBJCE_P(object) == CACHED_PTR(Z_CACHE_SLOT_P(property_name)))) {
 +              uint32_t prop_offset = (uint32_t)(intptr_t)CACHED_PTR(Z_CACHE_SLOT_P(property_name) + sizeof(void*));
 +              zend_object *zobj = Z_OBJ_P(object);
 +              zval *property;
 +
 +              if (EXPECTED(prop_offset != (uint32_t)ZEND_DYNAMIC_PROPERTY_OFFSET)) {
 +                      property = OBJ_PROP(zobj, prop_offset);
 +                      if (Z_TYPE_P(property) != IS_UNDEF) {
 +fast_assign_obj:
 +                              value = zend_assign_to_variable(property, value, IS_VAR);
 +                              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                              }
 +                              goto exit_assign_obj;
 +                      }
 +              } else {
 +                      if (EXPECTED(zobj->properties != NULL)) {
 +                              if (UNEXPECTED(GC_REFCOUNT(zobj->properties) > 1)) {
 +                                      if (EXPECTED(!(GC_FLAGS(zobj->properties) & IS_ARRAY_IMMUTABLE))) {
 +                                              GC_REFCOUNT(zobj->properties)--;
 +                                      }
 +                                      zobj->properties = zend_array_dup(zobj->properties);
 +                              }
 +                              property = zend_hash_find(zobj->properties, Z_STR_P(property_name));
 +                              if (property) {
 +                                      goto fast_assign_obj;
 +                              }
 +                      }
 +
 +                      if (!zobj->ce->__set) {
 +
 +                              if (EXPECTED(zobj->properties == NULL)) {
 +                                      rebuild_object_properties(zobj);
 +                              }
 +                              if (IS_VAR == IS_CONST) {
 +                                      if (UNEXPECTED(Z_OPT_REFCOUNTED_P(value))) {
 +                                              Z_ADDREF_P(value);
 +                                      }
 +                              } else if (IS_VAR != IS_TMP_VAR) {
 +                                      if (Z_ISREF_P(value)) {
 +                                              if (IS_VAR == IS_VAR) {
 +                                                      zend_reference *ref = Z_REF_P(value);
 +                                                      if (--GC_REFCOUNT(ref) == 0) {
 +                                                              ZVAL_COPY_VALUE(&tmp, Z_REFVAL_P(value));
 +                                                              efree_size(ref, sizeof(zend_reference));
 +                                                              value = &tmp;
 +                                                      } else {
 +                                                              value = Z_REFVAL_P(value);
 +                                                              if (Z_REFCOUNTED_P(value)) {
 +                                                                      Z_ADDREF_P(value);
 +                                                              }
 +                                                      }
 +                                              } else {
 +                                                      value = Z_REFVAL_P(value);
 +                                                      if (Z_REFCOUNTED_P(value)) {
 +                                                              Z_ADDREF_P(value);
 +                                                      }
 +                                              }
 +                                      } else if (IS_VAR == IS_CV && Z_REFCOUNTED_P(value)) {
 +                                              Z_ADDREF_P(value);
 +                                      }
 +                              }
 +                              zend_hash_add_new(zobj->properties, Z_STR_P(property_name), value);
 +                              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                              }
 +                              goto exit_assign_obj;
 +                      }
 +              }
 +      }
 +
 +      if (!Z_OBJ_HT_P(object)->write_property) {
 +              zend_error(E_WARNING, "Attempt to assign property of non-object");
 +              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                      ZVAL_NULL(EX_VAR(opline->result.var));
 +              }
 +              zval_ptr_dtor_nogc(free_op_data);
 +              goto exit_assign_obj;
 +      }
 +
 +      if (IS_VAR == IS_CV || IS_VAR == IS_VAR) {
 +              ZVAL_DEREF(value);
 +      }
 +
 +      Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL);
 +
 +      if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) {
 +              ZVAL_COPY(EX_VAR(opline->result.var), value);
 +      }
 +      zval_ptr_dtor_nogc(free_op_data);
 +exit_assign_obj:
 +      zval_ptr_dtor_nogc(free_op2);
 +
 +      /* assign_obj has two opcodes! */
 +      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_DATA_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2;
 +      zval *object, *property_name, *value, tmp;
 +
 +      SAVE_OPLINE();
 +      object = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
 +
 +      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 +              HANDLE_EXCEPTION();
 +      }
 +
 +      property_name = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +      value = _get_zval_ptr_cv_BP_VAR_R(execute_data, (opline+1)->op1.var);
 +
 +      if (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) {
 +              do {
 +                      if (Z_ISREF_P(object)) {
 +                              object = Z_REFVAL_P(object);
 +                              if (EXPECTED(Z_TYPE_P(object) == IS_OBJECT)) {
 +                                      break;
 +                              }
 +                      }
 +                      if (EXPECTED(Z_TYPE_P(object) <= IS_FALSE ||
 +                          (Z_TYPE_P(object) == IS_STRING && Z_STRLEN_P(object) == 0))) {
 +                              zend_object *obj;
 +
 +                              zval_ptr_dtor(object);
 +                              object_init(object);
 +                              Z_ADDREF_P(object);
 +                              obj = Z_OBJ_P(object);
 +                              zend_error(E_WARNING, "Creating default object from empty value");
 +                              if (GC_REFCOUNT(obj) == 1) {
 +                                      /* the enclosing container was deleted, obj is unreferenced */
 +                                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                              ZVAL_NULL(EX_VAR(opline->result.var));
 +                                      }
 +
 +                                      OBJ_RELEASE(obj);
 +                                      goto exit_assign_obj;
 +                              }
 +                              Z_DELREF_P(object);
 +                      } else {
 +                              if (IS_CV != IS_VAR || EXPECTED(!Z_ISERROR_P(object))) {
 +                                      zend_error(E_WARNING, "Attempt to assign property of non-object");
 +                              }
 +                              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                      ZVAL_NULL(EX_VAR(opline->result.var));
 +                              }
 +
 +                              goto exit_assign_obj;
 +                      }
 +              } while (0);
 +      }
 +
 +      if ((IS_TMP_VAR|IS_VAR) == IS_CONST &&
 +          EXPECTED(Z_OBJCE_P(object) == CACHED_PTR(Z_CACHE_SLOT_P(property_name)))) {
 +              uint32_t prop_offset = (uint32_t)(intptr_t)CACHED_PTR(Z_CACHE_SLOT_P(property_name) + sizeof(void*));
 +              zend_object *zobj = Z_OBJ_P(object);
 +              zval *property;
 +
 +              if (EXPECTED(prop_offset != (uint32_t)ZEND_DYNAMIC_PROPERTY_OFFSET)) {
 +                      property = OBJ_PROP(zobj, prop_offset);
 +                      if (Z_TYPE_P(property) != IS_UNDEF) {
 +fast_assign_obj:
 +                              value = zend_assign_to_variable(property, value, IS_CV);
 +                              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                              }
 +                              goto exit_assign_obj;
 +                      }
 +              } else {
 +                      if (EXPECTED(zobj->properties != NULL)) {
 +                              if (UNEXPECTED(GC_REFCOUNT(zobj->properties) > 1)) {
 +                                      if (EXPECTED(!(GC_FLAGS(zobj->properties) & IS_ARRAY_IMMUTABLE))) {
 +                                              GC_REFCOUNT(zobj->properties)--;
 +                                      }
 +                                      zobj->properties = zend_array_dup(zobj->properties);
 +                              }
 +                              property = zend_hash_find(zobj->properties, Z_STR_P(property_name));
 +                              if (property) {
 +                                      goto fast_assign_obj;
 +                              }
 +                      }
 +
 +                      if (!zobj->ce->__set) {
 +
 +                              if (EXPECTED(zobj->properties == NULL)) {
 +                                      rebuild_object_properties(zobj);
 +                              }
 +                              if (IS_CV == IS_CONST) {
 +                                      if (UNEXPECTED(Z_OPT_REFCOUNTED_P(value))) {
 +                                              Z_ADDREF_P(value);
 +                                      }
 +                              } else if (IS_CV != IS_TMP_VAR) {
 +                                      if (Z_ISREF_P(value)) {
 +                                              if (IS_CV == IS_VAR) {
 +                                                      zend_reference *ref = Z_REF_P(value);
 +                                                      if (--GC_REFCOUNT(ref) == 0) {
 +                                                              ZVAL_COPY_VALUE(&tmp, Z_REFVAL_P(value));
 +                                                              efree_size(ref, sizeof(zend_reference));
 +                                                              value = &tmp;
 +                                                      } else {
 +                                                              value = Z_REFVAL_P(value);
 +                                                              if (Z_REFCOUNTED_P(value)) {
 +                                                                      Z_ADDREF_P(value);
 +                                                              }
 +                                                      }
 +                                              } else {
 +                                                      value = Z_REFVAL_P(value);
 +                                                      if (Z_REFCOUNTED_P(value)) {
 +                                                              Z_ADDREF_P(value);
 +                                                      }
 +                                              }
 +                                      } else if (IS_CV == IS_CV && Z_REFCOUNTED_P(value)) {
 +                                              Z_ADDREF_P(value);
 +                                      }
 +                              }
 +                              zend_hash_add_new(zobj->properties, Z_STR_P(property_name), value);
 +                              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                              }
 +                              goto exit_assign_obj;
 +                      }
 +              }
 +      }
 +
 +      if (!Z_OBJ_HT_P(object)->write_property) {
 +              zend_error(E_WARNING, "Attempt to assign property of non-object");
 +              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                      ZVAL_NULL(EX_VAR(opline->result.var));
 +              }
 +
 +              goto exit_assign_obj;
 +      }
 +
 +      if (IS_CV == IS_CV || IS_CV == IS_VAR) {
 +              ZVAL_DEREF(value);
 +      }
 +
 +      Z_OBJ_HT_P(object)->write_property(object, property_name, value, ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL);
 +
 +      if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) {
 +              ZVAL_COPY(EX_VAR(opline->result.var), value);
 +      }
 +
 +exit_assign_obj:
 +      zval_ptr_dtor_nogc(free_op2);
 +
 +      /* assign_obj has two opcodes! */
 +      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_TMPVAR_OP_DATA_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +
 +      zval *object_ptr;
 +      zend_free_op free_op2;
 +      zval *value;
 +      zval *variable_ptr;
 +      zval *dim;
 +
 +      SAVE_OPLINE();
 +      object_ptr = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
 +
 +      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +try_assign_dim_array:
 +              SEPARATE_ARRAY(object_ptr);
 +              if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED) {
 +                      variable_ptr = zend_hash_next_index_insert(Z_ARRVAL_P(object_ptr), &EG(uninitialized_zval));
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              zend_error(E_WARNING, "Cannot add element to the array as the next element is already occupied");
 +                              goto assign_dim_error;
 +                      }
 +              } else {
 +                      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +                      if ((IS_TMP_VAR|IS_VAR) == IS_CONST) {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W_CONST(Z_ARRVAL_P(object_ptr), dim);
 +                      } else {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W(Z_ARRVAL_P(object_ptr), dim);
 +                      }
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              goto assign_dim_error;
 +                      }
 +              }
 +              value = EX_CONSTANT((opline+1)->op1);
 +              value = zend_assign_to_variable(variable_ptr, value, IS_CONST);
 +              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +              }
 +      } else {
 +              if (EXPECTED(Z_ISREF_P(object_ptr))) {
 +                      object_ptr = Z_REFVAL_P(object_ptr);
 +                      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +                              goto try_assign_dim_array;
 +                      }
 +              }
 +              if (EXPECTED(Z_TYPE_P(object_ptr) == IS_OBJECT)) {
 +                      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +                      value = EX_CONSTANT((opline+1)->op1);
 +
 +                      zend_assign_to_object_dim(object_ptr, dim, value);
 +
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) {
 +                              ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                      }
 +
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) == IS_STRING)) {
 +                      if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED) {
 +                              zend_throw_error(NULL, "[] operator not supported for strings");
 +
 +
 +                              HANDLE_EXCEPTION();
 +                      } else {
 +                              dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +                              value = EX_CONSTANT((opline+1)->op1);
 +                              zend_assign_to_string_offset(object_ptr, dim, value, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL));
 +
 +                      }
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
 +                      ZVAL_NEW_ARR(object_ptr);
 +                      zend_hash_init(Z_ARRVAL_P(object_ptr), 8, NULL, ZVAL_PTR_DTOR, 0);
 +                      goto try_assign_dim_array;
 +              } else {
 +                      if (IS_CV != IS_VAR || EXPECTED(!Z_ISERROR_P(object_ptr))) {
 +                              zend_error(E_WARNING, "Cannot use a scalar value as an array");
 +                      }
 +                      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +assign_dim_error:
 +
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                              ZVAL_NULL(EX_VAR(opline->result.var));
 +                      }
 +              }
 +      }
 +      if ((IS_TMP_VAR|IS_VAR) != IS_UNUSED) {
 +              zval_ptr_dtor_nogc(free_op2);
 +      }
 +
 +      /* assign_dim has two opcodes! */
 +      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_TMPVAR_OP_DATA_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +
 +      zval *object_ptr;
 +      zend_free_op free_op2, free_op_data;
 +      zval *value;
 +      zval *variable_ptr;
 +      zval *dim;
 +
 +      SAVE_OPLINE();
 +      object_ptr = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
 +
 +      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +try_assign_dim_array:
 +              SEPARATE_ARRAY(object_ptr);
 +              if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED) {
 +                      variable_ptr = zend_hash_next_index_insert(Z_ARRVAL_P(object_ptr), &EG(uninitialized_zval));
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              zend_error(E_WARNING, "Cannot add element to the array as the next element is already occupied");
 +                              goto assign_dim_error;
 +                      }
 +              } else {
 +                      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +                      if ((IS_TMP_VAR|IS_VAR) == IS_CONST) {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W_CONST(Z_ARRVAL_P(object_ptr), dim);
 +                      } else {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W(Z_ARRVAL_P(object_ptr), dim);
 +                      }
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              goto assign_dim_error;
 +                      }
 +              }
 +              value = _get_zval_ptr_tmp((opline+1)->op1.var, execute_data, &free_op_data);
 +              value = zend_assign_to_variable(variable_ptr, value, IS_TMP_VAR);
 +              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +              }
 +      } else {
 +              if (EXPECTED(Z_ISREF_P(object_ptr))) {
 +                      object_ptr = Z_REFVAL_P(object_ptr);
 +                      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +                              goto try_assign_dim_array;
 +                      }
 +              }
 +              if (EXPECTED(Z_TYPE_P(object_ptr) == IS_OBJECT)) {
 +                      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +                      value = _get_zval_ptr_tmp((opline+1)->op1.var, execute_data, &free_op_data);
 +
 +                      zend_assign_to_object_dim(object_ptr, dim, value);
 +
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) {
 +                              ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                      }
 +
 +                      zval_ptr_dtor_nogc(free_op_data);
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) == IS_STRING)) {
 +                      if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED) {
 +                              zend_throw_error(NULL, "[] operator not supported for strings");
 +                              zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
 +
 +                              HANDLE_EXCEPTION();
 +                      } else {
 +                              dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +                              value = _get_zval_ptr_tmp((opline+1)->op1.var, execute_data, &free_op_data);
 +                              zend_assign_to_string_offset(object_ptr, dim, value, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL));
 +                              zval_ptr_dtor_nogc(free_op_data);
 +                      }
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
 +                      ZVAL_NEW_ARR(object_ptr);
 +                      zend_hash_init(Z_ARRVAL_P(object_ptr), 8, NULL, ZVAL_PTR_DTOR, 0);
 +                      goto try_assign_dim_array;
 +              } else {
 +                      if (IS_CV != IS_VAR || EXPECTED(!Z_ISERROR_P(object_ptr))) {
 +                              zend_error(E_WARNING, "Cannot use a scalar value as an array");
 +                      }
 +                      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +assign_dim_error:
 +                      zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                              ZVAL_NULL(EX_VAR(opline->result.var));
 +                      }
 +              }
 +      }
 +      if ((IS_TMP_VAR|IS_VAR) != IS_UNUSED) {
 +              zval_ptr_dtor_nogc(free_op2);
 +      }
 +
 +      /* assign_dim has two opcodes! */
 +      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_TMPVAR_OP_DATA_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +
 +      zval *object_ptr;
 +      zend_free_op free_op2, free_op_data;
 +      zval *value;
 +      zval *variable_ptr;
 +      zval *dim;
 +
 +      SAVE_OPLINE();
 +      object_ptr = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
 +
 +      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +try_assign_dim_array:
 +              SEPARATE_ARRAY(object_ptr);
 +              if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED) {
 +                      variable_ptr = zend_hash_next_index_insert(Z_ARRVAL_P(object_ptr), &EG(uninitialized_zval));
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              zend_error(E_WARNING, "Cannot add element to the array as the next element is already occupied");
 +                              goto assign_dim_error;
 +                      }
 +              } else {
 +                      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +                      if ((IS_TMP_VAR|IS_VAR) == IS_CONST) {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W_CONST(Z_ARRVAL_P(object_ptr), dim);
 +                      } else {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W(Z_ARRVAL_P(object_ptr), dim);
 +                      }
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              goto assign_dim_error;
 +                      }
 +              }
 +              value = _get_zval_ptr_var((opline+1)->op1.var, execute_data, &free_op_data);
 +              value = zend_assign_to_variable(variable_ptr, value, IS_VAR);
 +              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +              }
 +      } else {
 +              if (EXPECTED(Z_ISREF_P(object_ptr))) {
 +                      object_ptr = Z_REFVAL_P(object_ptr);
 +                      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +                              goto try_assign_dim_array;
 +                      }
 +              }
 +              if (EXPECTED(Z_TYPE_P(object_ptr) == IS_OBJECT)) {
 +                      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +                      value = _get_zval_ptr_var((opline+1)->op1.var, execute_data, &free_op_data);
 +
 +                      zend_assign_to_object_dim(object_ptr, dim, value);
 +
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) {
 +                              ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                      }
 +
 +                      zval_ptr_dtor_nogc(free_op_data);
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) == IS_STRING)) {
 +                      if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED) {
 +                              zend_throw_error(NULL, "[] operator not supported for strings");
 +                              zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
 +
 +                              HANDLE_EXCEPTION();
 +                      } else {
 +                              dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +                              value = _get_zval_ptr_var_deref((opline+1)->op1.var, execute_data, &free_op_data);
 +                              zend_assign_to_string_offset(object_ptr, dim, value, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL));
 +                              zval_ptr_dtor_nogc(free_op_data);
 +                      }
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
 +                      ZVAL_NEW_ARR(object_ptr);
 +                      zend_hash_init(Z_ARRVAL_P(object_ptr), 8, NULL, ZVAL_PTR_DTOR, 0);
 +                      goto try_assign_dim_array;
 +              } else {
 +                      if (IS_CV != IS_VAR || EXPECTED(!Z_ISERROR_P(object_ptr))) {
 +                              zend_error(E_WARNING, "Cannot use a scalar value as an array");
 +                      }
 +                      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +assign_dim_error:
 +                      zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                              ZVAL_NULL(EX_VAR(opline->result.var));
 +                      }
 +              }
 +      }
 +      if ((IS_TMP_VAR|IS_VAR) != IS_UNUSED) {
 +              zval_ptr_dtor_nogc(free_op2);
 +      }
 +
 +      /* assign_dim has two opcodes! */
 +      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_TMPVAR_OP_DATA_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +
 +      zval *object_ptr;
 +      zend_free_op free_op2;
 +      zval *value;
 +      zval *variable_ptr;
 +      zval *dim;
 +
 +      SAVE_OPLINE();
 +      object_ptr = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var);
 +
 +      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +try_assign_dim_array:
 +              SEPARATE_ARRAY(object_ptr);
 +              if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED) {
 +                      variable_ptr = zend_hash_next_index_insert(Z_ARRVAL_P(object_ptr), &EG(uninitialized_zval));
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              zend_error(E_WARNING, "Cannot add element to the array as the next element is already occupied");
 +                              goto assign_dim_error;
 +                      }
 +              } else {
 +                      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +                      if ((IS_TMP_VAR|IS_VAR) == IS_CONST) {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W_CONST(Z_ARRVAL_P(object_ptr), dim);
 +                      } else {
 +                              variable_ptr = zend_fetch_dimension_address_inner_W(Z_ARRVAL_P(object_ptr), dim);
 +                      }
 +                      if (UNEXPECTED(variable_ptr == NULL)) {
 +                              goto assign_dim_error;
 +                      }
 +              }
 +              value = _get_zval_ptr_cv_BP_VAR_R(execute_data, (opline+1)->op1.var);
 +              value = zend_assign_to_variable(variable_ptr, value, IS_CV);
 +              if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                      ZVAL_COPY(EX_VAR(opline->result.var), value);
 +              }
 +      } else {
 +              if (EXPECTED(Z_ISREF_P(object_ptr))) {
 +                      object_ptr = Z_REFVAL_P(object_ptr);
 +                      if (EXPECTED(Z_TYPE_P(object_ptr) == IS_ARRAY)) {
 +                              goto try_assign_dim_array;
 +                      }
 +              }
 +              if (EXPECTED(Z_TYPE_P(object_ptr) == IS_OBJECT)) {
 +                      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +                      value = _get_zval_ptr_cv_BP_VAR_R(execute_data, (opline+1)->op1.var);
 +
 +                      zend_assign_to_object_dim(object_ptr, dim, value);
 +
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) {
 +                              ZVAL_COPY(EX_VAR(opline->result.var), value);
 +                      }
 +
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) == IS_STRING)) {
 +                      if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED) {
 +                              zend_throw_error(NULL, "[] operator not supported for strings");
 +
 +
 +                              HANDLE_EXCEPTION();
 +                      } else {
 +                              dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +                              value = _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, (opline+1)->op1.var);
 +                              zend_assign_to_string_offset(object_ptr, dim, value, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL));
 +
 +                      }
 +              } else if (EXPECTED(Z_TYPE_P(object_ptr) <= IS_FALSE)) {
 +                      ZVAL_NEW_ARR(object_ptr);
 +                      zend_hash_init(Z_ARRVAL_P(object_ptr), 8, NULL, ZVAL_PTR_DTOR, 0);
 +                      goto try_assign_dim_array;
 +              } else {
 +                      if (IS_CV != IS_VAR || EXPECTED(!Z_ISERROR_P(object_ptr))) {
 +                              zend_error(E_WARNING, "Cannot use a scalar value as an array");
 +                      }
 +                      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +assign_dim_error:
 +
 +                      if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 +                              ZVAL_NULL(EX_VAR(opline->result.var));
 +                      }
 +              }
 +      }
 +      if ((IS_TMP_VAR|IS_VAR) != IS_UNUSED) {
 +              zval_ptr_dtor_nogc(free_op2);
 +      }
 +
 +      /* assign_dim has two opcodes! */
 +      ZEND_VM_NEXT_OPCODE_EX(1, 2);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FAST_CONCAT_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2;
 +      zval *op1, *op2;
 +      zend_string *op1_str, *op2_str, *str;
 +
 +      SAVE_OPLINE();
 +      op1 = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
 +      if (IS_CV == IS_CONST) {
 +              op1_str = Z_STR_P(op1);
 +      } else if (EXPECTED(Z_TYPE_P(op1) == IS_STRING)) {
 +              op1_str = zend_string_copy(Z_STR_P(op1));
 +      } else {
 +              if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
 +                      GET_OP1_UNDEF_CV(op1, BP_VAR_R);
 +              }
 +              op1_str = _zval_get_string_func(op1);
 +      }
 +      op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +      if ((IS_TMP_VAR|IS_VAR) == IS_CONST) {
 +              op2_str = Z_STR_P(op2);
 +      } else if (EXPECTED(Z_TYPE_P(op2) == IS_STRING)) {
                op2_str = zend_string_copy(Z_STR_P(op2));
        } else {
 -              if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
 -                      GET_OP2_UNDEF_CV(op2, BP_VAR_R);
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
 +                      GET_OP2_UNDEF_CV(op2, BP_VAR_R);
 +              }
 +              op2_str = _zval_get_string_func(op2);
 +      }
 +      do {
 +              if (IS_CV != IS_CONST) {
 +                      if (UNEXPECTED(ZSTR_LEN(op1_str) == 0)) {
 +                              if ((IS_TMP_VAR|IS_VAR) == IS_CONST) {
 +                                      zend_string_addref(op2_str);
 +                              }
 +                              ZVAL_STR(EX_VAR(opline->result.var), op2_str);
 +                              zend_string_release(op1_str);
 +                              break;
 +                      }
 +              }
 +              if ((IS_TMP_VAR|IS_VAR) != IS_CONST) {
 +                      if (UNEXPECTED(ZSTR_LEN(op2_str) == 0)) {
 +                              if (IS_CV == IS_CONST) {
 +                                      zend_string_addref(op1_str);
 +                              }
 +                              ZVAL_STR(EX_VAR(opline->result.var), op1_str);
 +                              zend_string_release(op2_str);
 +                              break;
 +                      }
 +              }
 +              str = zend_string_alloc(ZSTR_LEN(op1_str) + ZSTR_LEN(op2_str), 0);
 +              memcpy(ZSTR_VAL(str), ZSTR_VAL(op1_str), ZSTR_LEN(op1_str));
 +              memcpy(ZSTR_VAL(str) + ZSTR_LEN(op1_str), ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);
 +              ZVAL_NEW_STR(EX_VAR(opline->result.var), str);
 +              if (IS_CV != IS_CONST) {
 +                      zend_string_release(op1_str);
 +              }
 +              if ((IS_TMP_VAR|IS_VAR) != IS_CONST) {
 +                      zend_string_release(op2_str);
 +              }
 +      } while (0);
 +
 +      zval_ptr_dtor_nogc(free_op2);
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zval *function_name;
 +      zend_free_op free_op2;
 +      zval *object;
 +      zend_function *fbc;
 +      zend_class_entry *called_scope;
 +      zend_object *obj;
 +      zend_execute_data *call;
 +      uint32_t call_info;
 +
 +      SAVE_OPLINE();
 +
 +      function_name = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +
 +      if ((IS_TMP_VAR|IS_VAR) != IS_CONST &&
 +          UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
 +              do {
 +                      if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) && Z_ISREF_P(function_name)) {
 +                              function_name = Z_REFVAL_P(function_name);
 +                              if (EXPECTED(Z_TYPE_P(function_name) == IS_STRING)) {
 +                                      break;
 +                              }
 +                      } else if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(function_name) == IS_UNDEF)) {
 +                              GET_OP2_UNDEF_CV(function_name, BP_VAR_R);
 +                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                      HANDLE_EXCEPTION();
 +                              }
 +                      }
 +                      zend_throw_error(NULL, "Method name must be a string");
 +                      zval_ptr_dtor_nogc(free_op2);
 +
 +                      HANDLE_EXCEPTION();
 +              } while (0);
 +      }
 +
 +      object = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
 +
 +      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              zval_ptr_dtor_nogc(free_op2);
 +              HANDLE_EXCEPTION();
 +      }
 +
 +      if (IS_CV != IS_UNUSED) {
 +              do {
 +                      if (IS_CV == IS_CONST || UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) {
 +                              if ((IS_CV & (IS_VAR|IS_CV)) && EXPECTED(Z_ISREF_P(object))) {
 +                                      object = Z_REFVAL_P(object);
 +                                      if (EXPECTED(Z_TYPE_P(object) == IS_OBJECT)) {
 +                                              break;
 +                                      }
 +                              }
 +                              if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(object) == IS_UNDEF)) {
 +                                      object = GET_OP1_UNDEF_CV(object, BP_VAR_R);
 +                                      if (UNEXPECTED(EG(exception) != NULL)) {
 +                                              zval_ptr_dtor_nogc(free_op2);
 +                                              HANDLE_EXCEPTION();
 +                                      }
 +                              }
 +                              zend_throw_error(NULL, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
 +                              zval_ptr_dtor_nogc(free_op2);
 +
 +                              HANDLE_EXCEPTION();
 +                      }
 +              } while (0);
 +      }
 +
 +      obj = Z_OBJ_P(object);
 +      called_scope = obj->ce;
 +
 +      if ((IS_TMP_VAR|IS_VAR) != IS_CONST ||
 +          UNEXPECTED((fbc = CACHED_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(function_name), called_scope)) == NULL)) {
 +          zend_object *orig_obj = obj;
 +
 +              if (UNEXPECTED(obj->handlers->get_method == NULL)) {
 +                      zend_throw_error(NULL, "Object does not support method calls");
 +                      zval_ptr_dtor_nogc(free_op2);
 +
 +                      HANDLE_EXCEPTION();
 +              }
 +
 +              /* First, locate the function. */
 +              fbc = obj->handlers->get_method(&obj, Z_STR_P(function_name), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL));
 +              if (UNEXPECTED(fbc == NULL)) {
 +                      if (EXPECTED(!EG(exception))) {
 +                              zend_throw_error(NULL, "Call to undefined method %s::%s()", ZSTR_VAL(obj->ce->name), Z_STRVAL_P(function_name));
 +                      }
 +                      zval_ptr_dtor_nogc(free_op2);
 +
 +                      HANDLE_EXCEPTION();
 +              }
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CONST &&
 +                  EXPECTED(fbc->type <= ZEND_USER_FUNCTION) &&
 +                  EXPECTED(!(fbc->common.fn_flags & (ZEND_ACC_CALL_VIA_TRAMPOLINE|ZEND_ACC_NEVER_CACHE))) &&
 +                  EXPECTED(obj == orig_obj)) {
 +                      CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(function_name), called_scope, fbc);
 +              }
 +              if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +                      init_func_run_time_cache(&fbc->op_array);
 +              }
 +      }
 +
 +      call_info = ZEND_CALL_NESTED_FUNCTION;
 +      if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_STATIC) != 0)) {
 +              obj = NULL;
 +      } else if (IS_CV & (IS_VAR|IS_TMP_VAR|IS_CV)) {
 +              /* CV may be changed indirectly (e.g. when it's a reference) */
 +              call_info = ZEND_CALL_NESTED_FUNCTION | ZEND_CALL_RELEASE_THIS;
 +              GC_REFCOUNT(obj)++; /* For $this pointer */
 +      }
 +
++      zval_ptr_dtor_nogc(free_op2);
++
++      if ((IS_CV & (IS_VAR|IS_TMP_VAR)) && UNEXPECTED(EG(exception))) {
++              HANDLE_EXCEPTION();
++      }
++
 +      call = zend_vm_stack_push_call_frame(call_info,
 +              fbc, opline->extended_value, called_scope, obj);
 +      call->prev_execute_data = EX(call);
 +      EX(call) = call;
 +
-       zval_ptr_dtor_nogc(free_op2);
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
++      ZEND_VM_NEXT_OPCODE();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2;
 +      zval *op1, *op2, *result;
 +
 +      op1 = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
 +      op2 = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +      do {
 +              int result;
 +
 +              if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
 +                      if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
 +                              result = (Z_LVAL_P(op1) == Z_LVAL_P(op2));
 +                      } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
 +                              result = ((double)Z_LVAL_P(op1) == Z_DVAL_P(op2));
 +                      } else {
 +                              break;
 +                      }
 +              } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
 +                      if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
 +                              result = (Z_DVAL_P(op1) == Z_DVAL_P(op2));
 +                      } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
 +                              result = (Z_DVAL_P(op1) == ((double)Z_LVAL_P(op2)));
 +                      } else {
 +                              break;
 +                      }
 +              } else if (EXPECTED(Z_TYPE_P(op1) == IS_STRING)) {
 +                      if (EXPECTED(Z_TYPE_P(op2) == IS_STRING)) {
 +                              if (Z_STR_P(op1) == Z_STR_P(op2)) {
 +                                      result = 1;
 +                              } else if (Z_STRVAL_P(op1)[0] > '9' || Z_STRVAL_P(op2)[0] > '9') {
 +                                      if (Z_STRLEN_P(op1) != Z_STRLEN_P(op2)) {
 +                                              result = 0;
 +                                      } else {
 +                                              result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0);
 +                                      }
 +                              } else {
 +                                      result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0);
 +                              }
 +                              zval_ptr_dtor_nogc(free_op2);
 +                      } else {
 +                              break;
 +                      }
 +              } else {
 +                      break;
 +              }
 +              ZEND_VM_SMART_BRANCH(result, 0);
 +              ZVAL_BOOL(EX_VAR(opline->result.var), result);
 +              ZEND_VM_NEXT_OPCODE();
 +      } while (0);
 +
 +      SAVE_OPLINE();
 +      if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
 +              op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
 +      }
 +      if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
 +              op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
 +      }
 +      result = EX_VAR(opline->result.var);
 +      compare_function(result, op1, op2);
 +      ZVAL_BOOL(result, Z_LVAL_P(result) == 0);
 +      zval_ptr_dtor_nogc(free_op2);
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +
 +      zval *expr_ptr, new_expr;
 +
 +      SAVE_OPLINE();
 +      if ((IS_CV == IS_VAR || IS_CV == IS_CV) &&
 +          UNEXPECTED(opline->extended_value & ZEND_ARRAY_ELEMENT_REF)) {
 +              expr_ptr = _get_zval_ptr_cv_BP_VAR_W(execute_data, opline->op1.var);
 +              ZVAL_MAKE_REF(expr_ptr);
 +              Z_ADDREF_P(expr_ptr);
 +
 +      } else {
 +              expr_ptr = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var);
 +              if (IS_CV == IS_TMP_VAR) {
 +                      /* pass */
 +              } else if (IS_CV == IS_CONST) {
 +                      if (Z_REFCOUNTED_P(expr_ptr)) {
 +                              Z_ADDREF_P(expr_ptr);
 +                      }
 +              } else if (IS_CV == IS_CV) {
 +                      ZVAL_DEREF(expr_ptr);
 +                      if (Z_REFCOUNTED_P(expr_ptr)) {
 +                              Z_ADDREF_P(expr_ptr);
 +                      }
 +              } else /* if (IS_CV == IS_VAR) */ {
 +                      if (UNEXPECTED(Z_ISREF_P(expr_ptr))) {
 +                              zend_refcounted *ref = Z_COUNTED_P(expr_ptr);
 +
 +                              expr_ptr = Z_REFVAL_P(expr_ptr);
 +                              if (UNEXPECTED(--GC_REFCOUNT(ref) == 0)) {
 +                                      ZVAL_COPY_VALUE(&new_expr, expr_ptr);
 +                                      expr_ptr = &new_expr;
 +                                      efree_size(ref, sizeof(zend_reference));
 +                              } else if (Z_OPT_REFCOUNTED_P(expr_ptr)) {
 +                                      Z_ADDREF_P(expr_ptr);
 +                              }
 +                      }
 +              }
 +      }
 +
 +      if ((IS_TMP_VAR|IS_VAR) != IS_UNUSED) {
 +              zend_free_op free_op2;
 +              zval *offset = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +              zend_string *str;
 +              zend_ulong hval;
 +
 +add_again:
 +              if (EXPECTED(Z_TYPE_P(offset) == IS_STRING)) {
 +                      str = Z_STR_P(offset);
 +                      if ((IS_TMP_VAR|IS_VAR) != IS_CONST) {
 +                              if (ZEND_HANDLE_NUMERIC(str, hval)) {
 +                                      goto num_index;
 +                              }
 +                      }
 +str_index:
 +                      zend_hash_update(Z_ARRVAL_P(EX_VAR(opline->result.var)), str, expr_ptr);
 +              } else if (EXPECTED(Z_TYPE_P(offset) == IS_LONG)) {
 +                      hval = Z_LVAL_P(offset);
 +num_index:
 +                      zend_hash_index_update(Z_ARRVAL_P(EX_VAR(opline->result.var)), hval, expr_ptr);
 +              } else if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) && EXPECTED(Z_TYPE_P(offset) == IS_REFERENCE)) {
 +                      offset = Z_REFVAL_P(offset);
 +                      goto add_again;
 +              } else if (Z_TYPE_P(offset) == IS_NULL) {
 +                      str = ZSTR_EMPTY_ALLOC();
 +                      goto str_index;
 +              } else if (Z_TYPE_P(offset) == IS_DOUBLE) {
 +                      hval = zend_dval_to_lval(Z_DVAL_P(offset));
 +                      goto num_index;
 +              } else if (Z_TYPE_P(offset) == IS_FALSE) {
 +                      hval = 0;
 +                      goto num_index;
 +              } else if (Z_TYPE_P(offset) == IS_TRUE) {
 +                      hval = 1;
 +                      goto num_index;
 +              } else if ((IS_TMP_VAR|IS_VAR) == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
 +                      GET_OP2_UNDEF_CV(offset, BP_VAR_R);
 +                      str = ZSTR_EMPTY_ALLOC();
 +                      goto str_index;
 +              } else {
 +                      zend_error(E_WARNING, "Illegal offset type");
 +                      zval_ptr_dtor(expr_ptr);
 +              }
 +              zval_ptr_dtor_nogc(free_op2);
 +      } else {
 +              if (!zend_hash_next_index_insert(Z_ARRVAL_P(EX_VAR(opline->result.var)), expr_ptr)) {
 +                      zend_error(E_WARNING, "Cannot add element to the array as the next element is already occupied");
 +                      zval_ptr_dtor(expr_ptr);
 +              }
 +      }
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      zval *array;
 +      uint32_t size;
 +      USE_OPLINE
 +
 +      array = EX_VAR(opline->result.var);
 +      if (IS_CV != IS_UNUSED) {
 +              size = opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT;
 +      } else {
 +              size = 0;
 +      }
 +      ZVAL_NEW_ARR(array);
 +      zend_hash_init(Z_ARRVAL_P(array), size, NULL, ZVAL_PTR_DTOR, 0);
 +
 +      if (IS_CV != IS_UNUSED) {
 +              /* Explicitly initialize array as not-packed if flag is set */
 +              if (opline->extended_value & ZEND_ARRAY_NOT_PACKED) {
 +                      zend_hash_real_init(Z_ARRVAL_P(array), 0);
 +              }
 +      }
 +
 +      if (IS_CV == IS_UNUSED) {
 +              ZEND_VM_NEXT_OPCODE();
 +#if 0 || (IS_CV != IS_UNUSED)
 +      } else {
 +              ZEND_VM_TAIL_CALL(ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU));
 +#endif
 +      }
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2;
 +      zval *container;
 +      zval *offset;
 +      zend_ulong hval;
 +      zend_string *key;
 +
 +      SAVE_OPLINE();
 +      container = _get_zval_ptr_cv_undef_BP_VAR_UNSET(execute_data, opline->op1.var);
 +      offset = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +
 +      do {
 +              if (EXPECTED(Z_TYPE_P(container) == IS_ARRAY)) {
 +                      HashTable *ht;
 +
 +unset_dim_array:
 +                      SEPARATE_ARRAY(container);
 +                      ht = Z_ARRVAL_P(container);
 +offset_again:
 +                      if (EXPECTED(Z_TYPE_P(offset) == IS_STRING)) {
 +                              key = Z_STR_P(offset);
 +                              if ((IS_TMP_VAR|IS_VAR) != IS_CONST) {
 +                                      if (ZEND_HANDLE_NUMERIC(key, hval)) {
 +                                              goto num_index_dim;
 +                                      }
 +                              }
 +str_index_dim:
 +                              if (ht == &EG(symbol_table)) {
 +                                      zend_delete_global_variable(key);
 +                              } else {
 +                                      zend_hash_del(ht, key);
 +                              }
 +                      } else if (EXPECTED(Z_TYPE_P(offset) == IS_LONG)) {
 +                              hval = Z_LVAL_P(offset);
 +num_index_dim:
 +                              zend_hash_index_del(ht, hval);
 +                      } else if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) && EXPECTED(Z_TYPE_P(offset) == IS_REFERENCE)) {
 +                              offset = Z_REFVAL_P(offset);
 +                              goto offset_again;
 +                      } else if (Z_TYPE_P(offset) == IS_DOUBLE) {
 +                              hval = zend_dval_to_lval(Z_DVAL_P(offset));
 +                              goto num_index_dim;
 +                      } else if (Z_TYPE_P(offset) == IS_NULL) {
 +                              key = ZSTR_EMPTY_ALLOC();
 +                              goto str_index_dim;
 +                      } else if (Z_TYPE_P(offset) == IS_FALSE) {
 +                              hval = 0;
 +                              goto num_index_dim;
 +                      } else if (Z_TYPE_P(offset) == IS_TRUE) {
 +                              hval = 1;
 +                              goto num_index_dim;
 +                      } else if (Z_TYPE_P(offset) == IS_RESOURCE) {
 +                              hval = Z_RES_HANDLE_P(offset);
 +                              goto num_index_dim;
 +                      } else if ((IS_TMP_VAR|IS_VAR) == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
 +                              GET_OP2_UNDEF_CV(offset, BP_VAR_R);
 +                              key = ZSTR_EMPTY_ALLOC();
 +                              goto str_index_dim;
 +                      } else {
 +                              zend_error(E_WARNING, "Illegal offset type in unset");
 +                      }
 +                      break;
 +              } else if (Z_ISREF_P(container)) {
 +                      container = Z_REFVAL_P(container);
 +                      if (EXPECTED(Z_TYPE_P(container) == IS_ARRAY)) {
 +                              goto unset_dim_array;
 +                      }
 +              }
 +              if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(container) == IS_UNDEF)) {
 +                      container = GET_OP1_UNDEF_CV(container, BP_VAR_R);
 +              }
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 +                      offset = GET_OP2_UNDEF_CV(offset, BP_VAR_R);
 +              }
 +              if (EXPECTED(Z_TYPE_P(container) == IS_OBJECT)) {
 +                      if (UNEXPECTED(Z_OBJ_HT_P(container)->unset_dimension == NULL)) {
 +                              zend_throw_error(NULL, "Cannot use object as array");
 +                      } else {
 +                              Z_OBJ_HT_P(container)->unset_dimension(container, offset);
 +                      }
 +              } else if (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) {
 +                      zend_throw_error(NULL, "Cannot unset string offsets");
 +              }
 +      } while (0);
 +
 +      zval_ptr_dtor_nogc(free_op2);
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_OBJ_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2;
 +      zval *container;
 +      zval *offset;
 +
 +      SAVE_OPLINE();
 +      container = _get_zval_ptr_cv_BP_VAR_UNSET(execute_data, opline->op1.var);
 +      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 +              HANDLE_EXCEPTION();
 +      }
 +      offset = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +
 +      do {
 +              if (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT)) {
 +                      if (Z_ISREF_P(container)) {
 +                              container = Z_REFVAL_P(container);
 +                              if (Z_TYPE_P(container) != IS_OBJECT) {
 +                                      break;
 +                              }
 +                      } else {
 +                              break;
 +                      }
 +              }
 +              if (Z_OBJ_HT_P(container)->unset_property) {
 +                      Z_OBJ_HT_P(container)->unset_property(container, offset, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL));
 +              } else {
 +                      zend_error(E_NOTICE, "Trying to unset property of non-object");
 +              }
 +      } while (0);
 +
 +      zval_ptr_dtor_nogc(free_op2);
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2;
 +      zval *container;
 +      int result;
 +      zend_ulong hval;
 +      zval *offset;
 +
 +      SAVE_OPLINE();
 +      container = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
 +      offset = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +
 +      if (EXPECTED(Z_TYPE_P(container) == IS_ARRAY)) {
 +              HashTable *ht;
 +              zval *value;
 +              zend_string *str;
 +
 +isset_dim_obj_array:
 +              ht = Z_ARRVAL_P(container);
 +isset_again:
 +              if (EXPECTED(Z_TYPE_P(offset) == IS_STRING)) {
 +                      str = Z_STR_P(offset);
 +                      if ((IS_TMP_VAR|IS_VAR) != IS_CONST) {
 +                              if (ZEND_HANDLE_NUMERIC(str, hval)) {
 +                                      goto num_index_prop;
 +                              }
 +                      }
 +str_index_prop:
 +                      value = zend_hash_find_ind(ht, str);
 +              } else if (EXPECTED(Z_TYPE_P(offset) == IS_LONG)) {
 +                      hval = Z_LVAL_P(offset);
 +num_index_prop:
 +                      value = zend_hash_index_find(ht, hval);
 +              } else if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) && EXPECTED(Z_ISREF_P(offset))) {
 +                      offset = Z_REFVAL_P(offset);
 +                      goto isset_again;
 +              } else if (Z_TYPE_P(offset) == IS_DOUBLE) {
 +                      hval = zend_dval_to_lval(Z_DVAL_P(offset));
 +                      goto num_index_prop;
 +              } else if (Z_TYPE_P(offset) == IS_NULL) {
 +                      str = ZSTR_EMPTY_ALLOC();
 +                      goto str_index_prop;
 +              } else if (Z_TYPE_P(offset) == IS_FALSE) {
 +                      hval = 0;
 +                      goto num_index_prop;
 +              } else if (Z_TYPE_P(offset) == IS_TRUE) {
 +                      hval = 1;
 +                      goto num_index_prop;
 +              } else if (Z_TYPE_P(offset) == IS_RESOURCE) {
 +                      hval = Z_RES_HANDLE_P(offset);
 +                      goto num_index_prop;
 +              } else if ((IS_TMP_VAR|IS_VAR) == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
 +                      GET_OP2_UNDEF_CV(offset, BP_VAR_R);
 +                      str = ZSTR_EMPTY_ALLOC();
 +                      goto str_index_prop;
 +              } else {
 +                      zend_error(E_WARNING, "Illegal offset type in isset or empty");
 +                      goto isset_not_found;
 +              }
 +
 +              if (opline->extended_value & ZEND_ISSET) {
 +                      /* > IS_NULL means not IS_UNDEF and not IS_NULL */
 +                      result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
 +                          (!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
 +              } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
 +                      result = (value == NULL || !i_zend_is_true(value));
 +              }
 +              goto isset_dim_obj_exit;
 +      } else if ((IS_CV & (IS_VAR|IS_CV)) && Z_ISREF_P(container)) {
 +              container = Z_REFVAL_P(container);
 +              if (EXPECTED(Z_TYPE_P(container) == IS_ARRAY)) {
 +                      goto isset_dim_obj_array;
 +              }
 +      }
 +
 +      if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 +              offset = GET_OP2_UNDEF_CV(offset, BP_VAR_R);
 +      }
 +
 +      if ((IS_CV != IS_CONST && EXPECTED(Z_TYPE_P(container) == IS_OBJECT))) {
 +              if (EXPECTED(Z_OBJ_HT_P(container)->has_dimension)) {
 +                      result =
 +                              ((opline->extended_value & ZEND_ISSET) == 0) ^
 +                              Z_OBJ_HT_P(container)->has_dimension(container, offset, (opline->extended_value & ZEND_ISSET) == 0);
 +              } else {
 +                      zend_error(E_NOTICE, "Trying to check element of non-array");
 +                      goto isset_not_found;
 +              }
 +      } else if (EXPECTED(Z_TYPE_P(container) == IS_STRING)) { /* string offsets */
 +              zend_long lval;
 +
 +              if (EXPECTED(Z_TYPE_P(offset) == IS_LONG)) {
 +                      lval = Z_LVAL_P(offset);
 +isset_str_offset:
 +                      if (UNEXPECTED(lval < 0)) { /* Handle negative offset */
 +                              lval += (zend_long)Z_STRLEN_P(container);
 +                      }
 +                      if (EXPECTED(lval >= 0) && (size_t)lval < Z_STRLEN_P(container)) {
 +                              if (opline->extended_value & ZEND_ISSET) {
 +                                      result = 1;
 +                              } else {
 +                                      result = (Z_STRVAL_P(container)[lval] == '0');
 +                              }
 +                      } else {
 +                              goto isset_not_found;
 +                      }
 +              } else {
 +                      if ((IS_TMP_VAR|IS_VAR) & (IS_CV|IS_VAR)) {
 +                              ZVAL_DEREF(offset);
 +                      }
 +                      if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
 +                                      || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 +                                              && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 +                              lval = zval_get_long(offset);
 +                              goto isset_str_offset;
 +                      }
 +                      goto isset_not_found;
 +              }
 +      } else {
 +isset_not_found:
 +              result = ((opline->extended_value & ZEND_ISSET) == 0);
 +      }
 +
 +isset_dim_obj_exit:
 +      zval_ptr_dtor_nogc(free_op2);
 +
 +      ZEND_VM_SMART_BRANCH(result, 1);
 +      ZVAL_BOOL(EX_VAR(opline->result.var), result);
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2;
 +      zval *container;
 +      int result;
 +      zval *offset;
 +
 +      SAVE_OPLINE();
 +      container = _get_zval_ptr_cv_BP_VAR_IS(execute_data, opline->op1.var);
 +
 +      if (IS_CV == IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 +              HANDLE_EXCEPTION();
 +      }
 +
 +      offset = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +
 +      if (IS_CV == IS_CONST ||
 +          (IS_CV != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT))) {
 +              if ((IS_CV & (IS_VAR|IS_CV)) && Z_ISREF_P(container)) {
 +                      container = Z_REFVAL_P(container);
 +                      if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT)) {
 +                              goto isset_no_object;
 +                      }
 +              } else {
 +                      goto isset_no_object;
 +              }
 +      }
 +      if (UNEXPECTED(!Z_OBJ_HT_P(container)->has_property)) {
 +              zend_error(E_NOTICE, "Trying to check property of non-object");
 +isset_no_object:
 +              result = ((opline->extended_value & ZEND_ISSET) == 0);
 +      } else {
 +              result =
 +                      ((opline->extended_value & ZEND_ISSET) == 0) ^
 +                      Z_OBJ_HT_P(container)->has_property(container, offset, (opline->extended_value & ZEND_ISSET) == 0, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL));
 +      }
 +
 +      zval_ptr_dtor_nogc(free_op2);
 +
 +      ZEND_VM_SMART_BRANCH(result, 1);
 +      ZVAL_BOOL(EX_VAR(opline->result.var), result);
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_R_INDEX_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op2;
 +      zval *container, *dim, *value;
 +      zend_long offset;
 +
 +      container = _get_zval_ptr_cv_undef(execute_data, opline->op1.var);
 +      dim = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2);
 +      if (EXPECTED(Z_TYPE_P(container) == IS_ARRAY)) {
 +fetch_dim_r_index_array:
 +              if (EXPECTED(Z_TYPE_P(dim) == IS_LONG)) {
 +                      offset = Z_LVAL_P(dim);
 +              } else {
 +                      offset = zval_get_long(dim);
 +              }
 +              ZEND_HASH_INDEX_FIND(Z_ARRVAL_P(container), offset, value, fetch_dim_r_index_undef);
 +              ZVAL_COPY_UNREF(EX_VAR(opline->result.var), value);
 +              if (IS_CV & (IS_TMP_VAR|IS_VAR)) {
 +                      SAVE_OPLINE();
 +
 +                      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +              } else {
 +                      ZEND_VM_NEXT_OPCODE();
 +              }
 +      } else if (IS_CV != IS_CONST && EXPECTED(Z_TYPE_P(container) == IS_REFERENCE)) {
 +              container = Z_REFVAL_P(container);
 +              if (EXPECTED(Z_TYPE_P(container) == IS_ARRAY)) {
 +                      goto fetch_dim_r_index_array;
 +              } else {
 +                      goto fetch_dim_r_index_slow;
 +              }
 +      } else {
 +fetch_dim_r_index_slow:
 +              SAVE_OPLINE();
 +              zend_fetch_dimension_address_read_R_slow(EX_VAR(opline->result.var), container, dim);
 +
 +              ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +      }
 +
 +fetch_dim_r_index_undef:
 +      ZVAL_NULL(EX_VAR(opline->result.var));
 +      SAVE_OPLINE();
 +      zend_error(E_NOTICE, "Undefined offset: " ZEND_LONG_FMT, offset);
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BW_NOT_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +
 +      SAVE_OPLINE();
 +      bitwise_not_function(EX_VAR(opline->result.var),
 +              _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1));
 +      zval_ptr_dtor_nogc(free_op1);
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BOOL_NOT_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zval *val;
 +      zend_free_op free_op1;
 +
 +      val = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +      if (Z_TYPE_INFO_P(val) == IS_TRUE) {
 +              ZVAL_FALSE(EX_VAR(opline->result.var));
 +      } else if (EXPECTED(Z_TYPE_INFO_P(val) <= IS_TRUE)) {
 +              ZVAL_TRUE(EX_VAR(opline->result.var));
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(val) == IS_UNDEF)) {
 +                      SAVE_OPLINE();
 +                      GET_OP1_UNDEF_CV(val, BP_VAR_R);
 +                      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +              }
 +      } else {
 +              SAVE_OPLINE();
 +              ZVAL_BOOL(EX_VAR(opline->result.var), !i_zend_is_true(val));
 +              zval_ptr_dtor_nogc(free_op1);
 +              ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +      }
 +      ZEND_VM_NEXT_OPCODE();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ECHO_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *z;
 +
 +      SAVE_OPLINE();
 +      z = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +
 +      if (Z_TYPE_P(z) == IS_STRING) {
 +              zend_string *str = Z_STR_P(z);
 +
 +              if (ZSTR_LEN(str) != 0) {
 +                      zend_write(ZSTR_VAL(str), ZSTR_LEN(str));
 +              }
 +      } else {
 +              zend_string *str = _zval_get_string_func(z);
 +
 +              if (ZSTR_LEN(str) != 0) {
 +                      zend_write(ZSTR_VAL(str), ZSTR_LEN(str));
 +              } else if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(z) == IS_UNDEF)) {
 +                      GET_OP1_UNDEF_CV(z, BP_VAR_R);
 +              }
 +              zend_string_release(str);
 +      }
 +
 +      zval_ptr_dtor_nogc(free_op1);
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *val;
 +
 +      val = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +
 +      if (Z_TYPE_INFO_P(val) == IS_TRUE) {
 +              ZEND_VM_SET_NEXT_OPCODE(opline + 1);
 +              ZEND_VM_CONTINUE();
 +      } else if (EXPECTED(Z_TYPE_INFO_P(val) <= IS_TRUE)) {
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(val) == IS_UNDEF)) {
 +                      SAVE_OPLINE();
 +                      GET_OP1_UNDEF_CV(val, BP_VAR_R);
 +                      ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2));
 +              } else {
 +                      ZEND_VM_SET_OPCODE(OP_JMP_ADDR(opline, opline->op2));
 +                      ZEND_VM_CONTINUE();
 +              }
 +      }
 +
 +      SAVE_OPLINE();
 +      if (i_zend_is_true(val)) {
 +              opline++;
 +      } else {
 +              opline = OP_JMP_ADDR(opline, opline->op2);
 +      }
 +      zval_ptr_dtor_nogc(free_op1);
 +      if (UNEXPECTED(EG(exception) != NULL)) {
 +              HANDLE_EXCEPTION();
 +      }
 +      ZEND_VM_JMP(opline);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *val;
 +
 +      val = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +
 +      if (Z_TYPE_INFO_P(val) == IS_TRUE) {
 +              ZEND_VM_SET_OPCODE(OP_JMP_ADDR(opline, opline->op2));
 +              ZEND_VM_CONTINUE();
 +      } else if (EXPECTED(Z_TYPE_INFO_P(val) <= IS_TRUE)) {
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(val) == IS_UNDEF)) {
 +                      SAVE_OPLINE();
 +                      GET_OP1_UNDEF_CV(val, BP_VAR_R);
 +                      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +              } else {
 +                      ZEND_VM_NEXT_OPCODE();
 +              }
 +      }
 +
 +      SAVE_OPLINE();
 +      if (i_zend_is_true(val)) {
 +              opline = OP_JMP_ADDR(opline, opline->op2);
 +      } else {
 +              opline++;
 +      }
 +      zval_ptr_dtor_nogc(free_op1);
 +      if (UNEXPECTED(EG(exception) != NULL)) {
 +              HANDLE_EXCEPTION();
 +      }
 +      ZEND_VM_JMP(opline);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZNZ_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *val;
 +
 +      val = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +
 +      if (EXPECTED(Z_TYPE_INFO_P(val) == IS_TRUE)) {
 +              ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
 +              ZEND_VM_CONTINUE();
 +      } else if (EXPECTED(Z_TYPE_INFO_P(val) <= IS_TRUE)) {
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CV) {
 +                      if (UNEXPECTED(Z_TYPE_INFO_P(val) == IS_UNDEF)) {
 +                              SAVE_OPLINE();
 +                              GET_OP1_UNDEF_CV(val, BP_VAR_R);
 +                      }
 +                      ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2));
 +              } else {
 +                      ZEND_VM_SET_OPCODE(OP_JMP_ADDR(opline, opline->op2));
 +                      ZEND_VM_CONTINUE();
 +              }
 +      }
 +
 +      SAVE_OPLINE();
 +      if (i_zend_is_true(val)) {
 +              opline = ZEND_OFFSET_TO_OPLINE(opline, opline->extended_value);
 +      } else {
 +              opline = OP_JMP_ADDR(opline, opline->op2);
 +      }
 +      zval_ptr_dtor_nogc(free_op1);
 +      if (UNEXPECTED(EG(exception) != NULL)) {
 +              HANDLE_EXCEPTION();
 +      }
 +      ZEND_VM_JMP(opline);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPZ_EX_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *val;
 +      int ret;
 +
 +      val = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +
 +      if (Z_TYPE_INFO_P(val) == IS_TRUE) {
 +              ZVAL_TRUE(EX_VAR(opline->result.var));
 +              ZEND_VM_SET_NEXT_OPCODE(opline + 1);
 +              ZEND_VM_CONTINUE();
 +      } else if (EXPECTED(Z_TYPE_INFO_P(val) <= IS_TRUE)) {
 +              ZVAL_FALSE(EX_VAR(opline->result.var));
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CV) {
 +                      if (UNEXPECTED(Z_TYPE_INFO_P(val) == IS_UNDEF)) {
 +                              SAVE_OPLINE();
 +                              GET_OP1_UNDEF_CV(val, BP_VAR_R);
 +                      }
 +                      ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2));
 +              } else {
 +                      ZEND_VM_SET_OPCODE(OP_JMP_ADDR(opline, opline->op2));
 +                      ZEND_VM_CONTINUE();
 +              }
 +      }
 +
 +      SAVE_OPLINE();
 +      ret = i_zend_is_true(val);
 +      zval_ptr_dtor_nogc(free_op1);
 +      if (ret) {
 +              ZVAL_TRUE(EX_VAR(opline->result.var));
 +              opline++;
 +      } else {
 +              ZVAL_FALSE(EX_VAR(opline->result.var));
 +              opline = OP_JMP_ADDR(opline, opline->op2);
 +      }
 +      if (UNEXPECTED(EG(exception) != NULL)) {
 +              HANDLE_EXCEPTION();
 +      }
 +      ZEND_VM_JMP(opline);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMPNZ_EX_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *val;
 +      int ret;
 +
 +      val = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +
 +      if (Z_TYPE_INFO_P(val) == IS_TRUE) {
 +              ZVAL_TRUE(EX_VAR(opline->result.var));
 +              ZEND_VM_SET_OPCODE(OP_JMP_ADDR(opline, opline->op2));
 +              ZEND_VM_CONTINUE();
 +      } else if (EXPECTED(Z_TYPE_INFO_P(val) <= IS_TRUE)) {
 +              ZVAL_FALSE(EX_VAR(opline->result.var));
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(val) == IS_UNDEF)) {
 +                      SAVE_OPLINE();
 +                      GET_OP1_UNDEF_CV(val, BP_VAR_R);
 +                      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +              } else {
 +                      ZEND_VM_NEXT_OPCODE();
 +              }
 +      }
 +
 +      SAVE_OPLINE();
 +      ret = i_zend_is_true(val);
 +      zval_ptr_dtor_nogc(free_op1);
 +      if (ret) {
 +              ZVAL_TRUE(EX_VAR(opline->result.var));
 +              opline = OP_JMP_ADDR(opline, opline->op2);
 +      } else {
 +              ZVAL_FALSE(EX_VAR(opline->result.var));
 +              opline++;
 +      }
 +      if (UNEXPECTED(EG(exception) != NULL)) {
 +              HANDLE_EXCEPTION();
 +      }
 +      ZEND_VM_JMP(opline);
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FREE_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +
 +      SAVE_OPLINE();
 +      zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_FREE_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      zval *var;
 +      USE_OPLINE
 +
 +      SAVE_OPLINE();
 +      var = EX_VAR(opline->op1.var);
 +      if (Z_TYPE_P(var) != IS_ARRAY && Z_FE_ITER_P(var) != (uint32_t)-1) {
 +              zend_hash_iterator_del(Z_FE_ITER_P(var));
 +      }
 +      zval_ptr_dtor_nogc(var);
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAL_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zval *value, *arg;
 +      zend_free_op free_op1;
 +
 +      value = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +      arg = ZEND_CALL_VAR(EX(call), opline->result.var);
 +      ZVAL_COPY_VALUE(arg, value);
 +      if ((IS_TMP_VAR|IS_VAR) == IS_CONST) {
 +              if (UNEXPECTED(Z_OPT_REFCOUNTED_P(arg))) {
 +                      Z_ADDREF_P(arg);
                }
 -              op2_str = _zval_get_string_func(op2);
        }
 +      ZEND_VM_NEXT_OPCODE();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BOOL_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zval *val;
 +      zend_free_op free_op1;
 +
 +      val = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +      if (Z_TYPE_INFO_P(val) == IS_TRUE) {
 +              ZVAL_TRUE(EX_VAR(opline->result.var));
 +      } else if (EXPECTED(Z_TYPE_INFO_P(val) <= IS_TRUE)) {
 +              ZVAL_FALSE(EX_VAR(opline->result.var));
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(val) == IS_UNDEF)) {
 +                      SAVE_OPLINE();
 +                      GET_OP1_UNDEF_CV(val, BP_VAR_R);
 +                      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +              }
 +      } else {
 +              SAVE_OPLINE();
 +              ZVAL_BOOL(EX_VAR(opline->result.var), i_zend_is_true(val));
 +              zval_ptr_dtor_nogc(free_op1);
 +              ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +      }
 +      ZEND_VM_NEXT_OPCODE();
 +}
 +
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CLONE_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *obj;
 +      zend_object *clone_obj;
 +      zend_class_entry *ce, *scope;
 +      zend_function *clone;
 +      zend_object_clone_obj_t clone_call;
 +
 +      SAVE_OPLINE();
 +      obj = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +
 +      if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED && UNEXPECTED(Z_TYPE_P(obj) == IS_UNDEF)) {
 +              zend_throw_error(NULL, "Using $this when not in object context");
 +              HANDLE_EXCEPTION();
 +      }
 +
        do {
 -              if (IS_CV != IS_CONST) {
 -                      if (UNEXPECTED(ZSTR_LEN(op1_str) == 0)) {
 -                              if ((IS_TMP_VAR|IS_VAR) == IS_CONST) {
 -                                      zend_string_addref(op2_str);
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CONST ||
 +                  ((IS_TMP_VAR|IS_VAR) != IS_UNUSED && UNEXPECTED(Z_TYPE_P(obj) != IS_OBJECT))) {
 +                  if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) && Z_ISREF_P(obj)) {
 +                      obj = Z_REFVAL_P(obj);
 +                      if (EXPECTED(Z_TYPE_P(obj) == IS_OBJECT)) {
 +                              break;
                                }
 -                              ZVAL_STR(EX_VAR(opline->result.var), op2_str);
 -                              zend_string_release(op1_str);
 -                              break;
                        }
 -              }
 -              if ((IS_TMP_VAR|IS_VAR) != IS_CONST) {
 -                      if (UNEXPECTED(ZSTR_LEN(op2_str) == 0)) {
 -                              if (IS_CV == IS_CONST) {
 -                                      zend_string_addref(op1_str);
 +                      if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(obj) == IS_UNDEF)) {
 +                              GET_OP1_UNDEF_CV(obj, BP_VAR_R);
 +                              if (UNEXPECTED(EG(exception) != NULL)) {
 +                                      HANDLE_EXCEPTION();
                                }
 -                              ZVAL_STR(EX_VAR(opline->result.var), op1_str);
 -                              zend_string_release(op2_str);
 -                              break;
                        }
 -              }
 -              str = zend_string_alloc(ZSTR_LEN(op1_str) + ZSTR_LEN(op2_str), 0);
 -              memcpy(ZSTR_VAL(str), ZSTR_VAL(op1_str), ZSTR_LEN(op1_str));
 -              memcpy(ZSTR_VAL(str) + ZSTR_LEN(op1_str), ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);
 -              ZVAL_NEW_STR(EX_VAR(opline->result.var), str);
 -              if (IS_CV != IS_CONST) {
 -                      zend_string_release(op1_str);
 -              }
 -              if ((IS_TMP_VAR|IS_VAR) != IS_CONST) {
 -                      zend_string_release(op2_str);
 +                      zend_throw_error(NULL, "__clone method called on non-object");
 +                      zval_ptr_dtor_nogc(free_op1);
 +                      HANDLE_EXCEPTION();
                }
        } while (0);
  
@@@ -52719,361 -40924,218 +52847,365 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
                }
        }
  
 -      if (EXPECTED(EG(exception) == NULL)) {
 -              ZVAL_OBJ(EX_VAR(opline->result.var), clone_call(obj));
 -              if (UNEXPECTED(!RETURN_VALUE_USED(opline)) || UNEXPECTED(EG(exception) != NULL)) {
 -                      OBJ_RELEASE(Z_OBJ_P(EX_VAR(opline->result.var)));
 -              }
 +      call_info = ZEND_CALL_NESTED_FUNCTION;
 +      if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_STATIC) != 0)) {
 +              obj = NULL;
 +      } else if ((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_TMP_VAR|IS_CV)) {
 +              /* CV may be changed indirectly (e.g. when it's a reference) */
 +              call_info = ZEND_CALL_NESTED_FUNCTION | ZEND_CALL_RELEASE_THIS;
 +              GC_REFCOUNT(obj)++; /* For $this pointer */
        }
 -      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +
+       zval_ptr_dtor_nogc(free_op1);
-       zval_ptr_dtor_nogc(free_op1);
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
++
++      if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_TMP_VAR)) && UNEXPECTED(EG(exception))) {
++              HANDLE_EXCEPTION();
++      }
++
 +      call = zend_vm_stack_push_call_frame(call_info,
 +              fbc, opline->extended_value, called_scope, obj);
 +      call->prev_execute_data = EX(call);
 +      EX(call) = call;
 +
++      ZEND_VM_NEXT_OPCODE();
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_TMPVAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
        USE_OPLINE
 -      zend_op_array *new_op_array=NULL;
        zend_free_op free_op1;
 -      zval *inc_filename;
 -      zval tmp_inc_filename;
 -      zend_bool failure_retval=0;
 +      zval *op1, *op2, *result;
  
 -      SAVE_OPLINE();
 -      inc_filename = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +      op1 = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +      op2 = EX_CONSTANT(opline->op2);
 +      do {
 +              int result;
  
 -      ZVAL_UNDEF(&tmp_inc_filename);
 -      if (Z_TYPE_P(inc_filename) != IS_STRING) {
 -              if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(inc_filename) == IS_UNDEF)) {
 -                      inc_filename = GET_OP1_UNDEF_CV(inc_filename, BP_VAR_R);
 -              }
 -              ZVAL_STR(&tmp_inc_filename, zval_get_string(inc_filename));
 -              inc_filename = &tmp_inc_filename;
 -      }
 +              if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
 +                      if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
 +                              result = (Z_LVAL_P(op1) == Z_LVAL_P(op2));
 +                      } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
 +                              result = ((double)Z_LVAL_P(op1) == Z_DVAL_P(op2));
 +                      } else {
 +                              break;
 +                      }
 +              } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
 +                      if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
 +                              result = (Z_DVAL_P(op1) == Z_DVAL_P(op2));
 +                      } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
 +                              result = (Z_DVAL_P(op1) == ((double)Z_LVAL_P(op2)));
 +                      } else {
 +                              break;
 +                      }
 +              } else if (EXPECTED(Z_TYPE_P(op1) == IS_STRING)) {
 +                      if (EXPECTED(Z_TYPE_P(op2) == IS_STRING)) {
 +                              if (Z_STR_P(op1) == Z_STR_P(op2)) {
 +                                      result = 1;
 +                              } else if (Z_STRVAL_P(op1)[0] > '9' || Z_STRVAL_P(op2)[0] > '9') {
 +                                      if (Z_STRLEN_P(op1) != Z_STRLEN_P(op2)) {
 +                                              result = 0;
 +                                      } else {
 +                                              result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0);
 +                                      }
 +                              } else {
 +                                      result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0);
 +                              }
  
 -      if (opline->extended_value != ZEND_EVAL && strlen(Z_STRVAL_P(inc_filename)) != Z_STRLEN_P(inc_filename)) {
 -              if (opline->extended_value == ZEND_INCLUDE_ONCE || opline->extended_value == ZEND_INCLUDE) {
 -                      zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename));
 +                      } else {
 +                              break;
 +                      }
                } else {
 -                      zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename));
 +                      break;
                }
 -      } else {
 -              switch (opline->extended_value) {
 -                      case ZEND_INCLUDE_ONCE:
 -                      case ZEND_REQUIRE_ONCE: {
 -                                      zend_file_handle file_handle;
 -                                      zend_string *resolved_path;
 +              ZEND_VM_SMART_BRANCH(result, 0);
 +              ZVAL_BOOL(EX_VAR(opline->result.var), result);
 +              ZEND_VM_NEXT_OPCODE();
 +      } while (0);
  
 -                                      resolved_path = zend_resolve_path(Z_STRVAL_P(inc_filename), (int)Z_STRLEN_P(inc_filename));
 -                                      if (resolved_path) {
 -                                              failure_retval = zend_hash_exists(&EG(included_files), resolved_path);
 -                                      } else {
 -                                              resolved_path = zend_string_copy(Z_STR_P(inc_filename));
 -                                      }
 +      SAVE_OPLINE();
 +      if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
 +              op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
 +      }
 +      if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
 +              op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
 +      }
 +      result = EX_VAR(opline->result.var);
 +      compare_function(result, op1, op2);
 +      ZVAL_BOOL(result, Z_LVAL_P(result) == 0);
  
 -                                      if (failure_retval) {
 -                                              /* do nothing, file already included */
 -                                      } else if (SUCCESS == zend_stream_open(ZSTR_VAL(resolved_path), &file_handle)) {
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
  
 -                                              if (!file_handle.opened_path) {
 -                                                      file_handle.opened_path = zend_string_copy(resolved_path);
 -                                              }
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_STATIC_PROP_SPEC_TMPVAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zval tmp, *varname;
 +      zend_class_entry *ce;
 +      zend_free_op free_op1;
  
 -                                              if (zend_hash_add_empty_element(&EG(included_files), file_handle.opened_path)) {
 -                                                      new_op_array = zend_compile_file(&file_handle, (opline->extended_value==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE));
 -                                                      zend_destroy_file_handle(&file_handle);
 -                                              } else {
 -                                                      zend_file_handle_dtor(&file_handle);
 -                                                      failure_retval=1;
 -                                              }
 -                                      } else {
 -                                              if (opline->extended_value == ZEND_INCLUDE_ONCE) {
 -                                                      zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename));
 -                                              } else {
 -                                                      zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename));
 -                                              }
 -                                      }
 -                                      zend_string_release(resolved_path);
 -                              }
 -                              break;
 -                      case ZEND_INCLUDE:
 -                      case ZEND_REQUIRE:
 -                              new_op_array = compile_filename(opline->extended_value, inc_filename);
 -                              break;
 -                      case ZEND_EVAL: {
 -                                      char *eval_desc = zend_make_compiled_string_description("eval()'d code");
 +      SAVE_OPLINE();
 +
 +      varname = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +
 +      ZVAL_UNDEF(&tmp);
 +      if ((IS_TMP_VAR|IS_VAR) != IS_CONST && Z_TYPE_P(varname) != IS_STRING) {
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(varname) == IS_UNDEF)) {
 +                      varname = GET_OP1_UNDEF_CV(varname, BP_VAR_R);
 +              }
 +              ZVAL_STR(&tmp, zval_get_string(varname));
 +              varname = &tmp;
 +      }
  
 -                                      new_op_array = zend_compile_string(inc_filename, eval_desc);
 -                                      efree(eval_desc);
 +      if (IS_CONST == IS_CONST) {
 +              ce = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)));
 +              if (UNEXPECTED(ce == NULL)) {
 +                      ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op2)), EX_CONSTANT(opline->op2) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
 +                      if (UNEXPECTED(ce == NULL)) {
 +                              ZEND_ASSERT(EG(exception));
 +                              if ((IS_TMP_VAR|IS_VAR) != IS_CONST && Z_TYPE(tmp) != IS_UNDEF) {
 +                                      zend_string_release(Z_STR(tmp));
                                }
 -                              break;
 -                      EMPTY_SWITCH_DEFAULT_CASE()
 +                              zval_ptr_dtor_nogc(free_op1);
 +                              HANDLE_EXCEPTION();
 +                      }
 +                      CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce);
                }
 +      } else if (IS_CONST == IS_UNUSED) {
 +              ce = zend_fetch_class(NULL, opline->op2.num);
 +              if (UNEXPECTED(ce == NULL)) {
 +                      ZEND_ASSERT(EG(exception));
 +                      if ((IS_TMP_VAR|IS_VAR) != IS_CONST && Z_TYPE(tmp) != IS_UNDEF) {
 +                              zend_string_release(Z_STR(tmp));
 +                      }
 +                      zval_ptr_dtor_nogc(free_op1);
 +                      HANDLE_EXCEPTION();
 +              }
 +      } else {
 +              ce = Z_CE_P(EX_VAR(opline->op2.var));
        }
 -      if (Z_TYPE(tmp_inc_filename) != IS_UNDEF) {
 -              zend_string_release(Z_STR(tmp_inc_filename));
 +      zend_std_unset_static_property(ce, Z_STR_P(varname));
 +
 +      if ((IS_TMP_VAR|IS_VAR) != IS_CONST && Z_TYPE(tmp) != IS_UNDEF) {
 +              zend_string_release(Z_STR(tmp));
        }
        zval_ptr_dtor_nogc(free_op1);
 -      if (UNEXPECTED(EG(exception) != NULL)) {
 -              if (new_op_array != NULL) {
 -                      destroy_op_array(new_op_array);
 -                      efree_size(new_op_array, sizeof(zend_op_array));
 -              }
 -              HANDLE_EXCEPTION();
 -      } else if (EXPECTED(new_op_array != NULL)) {
 -              zval *return_value = NULL;
 -              zend_execute_data *call;
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 +}
  
 -              if (RETURN_VALUE_USED(opline)) {
 -                      return_value = EX_VAR(opline->result.var);
 -              }
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_STATIC_PROP_SPEC_TMPVAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +{
 +      USE_OPLINE
 +      zval *value;
 +      int result;
 +      zend_free_op free_op1;
 +      zval tmp, *varname;
 +      zend_class_entry *ce;
 +
 +      SAVE_OPLINE();
 +      varname = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +      ZVAL_UNDEF(&tmp);
 +      if ((IS_TMP_VAR|IS_VAR) != IS_CONST && Z_TYPE_P(varname) != IS_STRING) {
 +              ZVAL_STR(&tmp, zval_get_string(varname));
 +              varname = &tmp;
 +      }
  
 -              new_op_array->scope = EG(scope);
 +      if (IS_CONST == IS_CONST) {
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CONST && EXPECTED((ce = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)))) != NULL)) {
 +                      value = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)) + sizeof(void*));
  
 -              call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_CODE,
 -                      (zend_function*)new_op_array, 0, EX(called_scope), Z_OBJ(EX(This)));
 +                      /* check if static properties were destoyed */
 +                      if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
 +                              value = NULL;
 +                      }
  
 -              if (EX(symbol_table)) {
 -                      call->symbol_table = EX(symbol_table);
 -              } else {
 -                      call->symbol_table = zend_rebuild_symbol_table();
 +                      goto is_static_prop_return;
 +              } else if (UNEXPECTED((ce = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)))) == NULL)) {
 +                      ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op2)), EX_CONSTANT(opline->op2) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
 +                      if (UNEXPECTED(ce == NULL)) {
 +                              ZEND_ASSERT(EG(exception));
 +                              HANDLE_EXCEPTION();
 +                      }
 +                      CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce);
                }
 -
 -              call->prev_execute_data = execute_data;
 -          i_init_code_execute_data(call, new_op_array, return_value);
 -              if (EXPECTED(zend_execute_ex == execute_ex)) {
 -                      ZEND_VM_ENTER();
 +      } else {
 +              if (IS_CONST == IS_UNUSED) {
 +                      ce = zend_fetch_class(NULL, opline->op2.num);
 +                      if (UNEXPECTED(ce == NULL)) {
 +                              ZEND_ASSERT(EG(exception));
 +                              if ((IS_TMP_VAR|IS_VAR) != IS_CONST && Z_TYPE(tmp) != IS_UNDEF) {
 +                                      zend_string_release(Z_STR(tmp));
 +                              }
 +                              zval_ptr_dtor_nogc(free_op1);
 +                              HANDLE_EXCEPTION();
 +                      }
                } else {
 -                      ZEND_ADD_CALL_FLAG(call, ZEND_CALL_TOP);
 -                      zend_execute_ex(call);
 -                      zend_vm_stack_free_call_frame(call);
 +                      ce = Z_CE_P(EX_VAR(opline->op2.var));
                }
 +              if ((IS_TMP_VAR|IS_VAR) == IS_CONST &&
 +                  (value = CACHED_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce)) != NULL) {
  
 -              destroy_op_array(new_op_array);
 -              efree_size(new_op_array, sizeof(zend_op_array));
 -              if (UNEXPECTED(EG(exception) != NULL)) {
 -                      zend_throw_exception_internal(NULL);
 -                      HANDLE_EXCEPTION();
 +                      /* check if static properties were destoyed */
 +                      if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
 +                              value = NULL;
 +                      }
 +
 +                      goto is_static_prop_return;
                }
 +      }
  
 -      } else if (RETURN_VALUE_USED(opline)) {
 -              ZVAL_BOOL(EX_VAR(opline->result.var), failure_retval);
 +      value = zend_std_get_static_property(ce, Z_STR_P(varname), 1);
 +
 +      if ((IS_TMP_VAR|IS_VAR) == IS_CONST && value) {
 +              CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, value);
        }
 -      ZEND_VM_INTERRUPT_CHECK();
 -      ZEND_VM_NEXT_OPCODE();
 +
 +      if ((IS_TMP_VAR|IS_VAR) != IS_CONST && Z_TYPE(tmp) != IS_UNDEF) {
 +              zend_string_release(Z_STR(tmp));
 +      }
 +      zval_ptr_dtor_nogc(free_op1);
 +
 +is_static_prop_return:
 +      if (opline->extended_value & ZEND_ISSET) {
 +              result = value && Z_TYPE_P(value) > IS_NULL &&
 +                  (!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
 +      } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
 +              result = !value || !i_zend_is_true(value);
 +      }
 +
 +      ZEND_VM_SMART_BRANCH(result, 1);
 +      ZVAL_BOOL(EX_VAR(opline->result.var), result);
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_EXIT_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_TMPVAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
        USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *container;
 +      int result;
 +      zend_ulong hval;
 +      zval *offset;
  
        SAVE_OPLINE();
 -      if ((IS_TMP_VAR|IS_VAR) != IS_UNUSED) {
 -              zend_free_op free_op1;
 -              zval *ptr = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +      container = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +      offset = EX_CONSTANT(opline->op2);
  
 -              do {
 -                      if (Z_TYPE_P(ptr) == IS_LONG) {
 -                              EG(exit_status) = Z_LVAL_P(ptr);
 -                      } else {
 -                              if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) && Z_ISREF_P(ptr)) {
 -                                      ptr = Z_REFVAL_P(ptr);
 -                                      if (Z_TYPE_P(ptr) == IS_LONG) {
 -                                              EG(exit_status) = Z_LVAL_P(ptr);
 -                                              break;
 -                                      }
 +      if (EXPECTED(Z_TYPE_P(container) == IS_ARRAY)) {
 +              HashTable *ht;
 +              zval *value;
 +              zend_string *str;
 +
 +isset_dim_obj_array:
 +              ht = Z_ARRVAL_P(container);
 +isset_again:
 +              if (EXPECTED(Z_TYPE_P(offset) == IS_STRING)) {
 +                      str = Z_STR_P(offset);
 +                      if (IS_CONST != IS_CONST) {
 +                              if (ZEND_HANDLE_NUMERIC(str, hval)) {
 +                                      goto num_index_prop;
                                }
 -                              zend_print_variable(ptr);
                        }
 -              } while (0);
 -              zval_ptr_dtor_nogc(free_op1);
 +str_index_prop:
 +                      value = zend_hash_find_ind(ht, str);
 +              } else if (EXPECTED(Z_TYPE_P(offset) == IS_LONG)) {
 +                      hval = Z_LVAL_P(offset);
 +num_index_prop:
 +                      value = zend_hash_index_find(ht, hval);
 +              } else if ((IS_CONST & (IS_VAR|IS_CV)) && EXPECTED(Z_ISREF_P(offset))) {
 +                      offset = Z_REFVAL_P(offset);
 +                      goto isset_again;
 +              } else if (Z_TYPE_P(offset) == IS_DOUBLE) {
 +                      hval = zend_dval_to_lval(Z_DVAL_P(offset));
 +                      goto num_index_prop;
 +              } else if (Z_TYPE_P(offset) == IS_NULL) {
 +                      str = ZSTR_EMPTY_ALLOC();
 +                      goto str_index_prop;
 +              } else if (Z_TYPE_P(offset) == IS_FALSE) {
 +                      hval = 0;
 +                      goto num_index_prop;
 +              } else if (Z_TYPE_P(offset) == IS_TRUE) {
 +                      hval = 1;
 +                      goto num_index_prop;
 +              } else if (Z_TYPE_P(offset) == IS_RESOURCE) {
 +                      hval = Z_RES_HANDLE_P(offset);
 +                      goto num_index_prop;
 +              } else if (IS_CONST == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
 +                      GET_OP2_UNDEF_CV(offset, BP_VAR_R);
 +                      str = ZSTR_EMPTY_ALLOC();
 +                      goto str_index_prop;
 +              } else {
 +                      zend_error(E_WARNING, "Illegal offset type in isset or empty");
 +                      goto isset_not_found;
 +              }
 +
 +              if (opline->extended_value & ZEND_ISSET) {
 +                      /* > IS_NULL means not IS_UNDEF and not IS_NULL */
 +                      result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
 +                          (!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
 +              } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
 +                      result = (value == NULL || !i_zend_is_true(value));
 +              }
 +              goto isset_dim_obj_exit;
 +      } else if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) && Z_ISREF_P(container)) {
 +              container = Z_REFVAL_P(container);
 +              if (EXPECTED(Z_TYPE_P(container) == IS_ARRAY)) {
 +                      goto isset_dim_obj_array;
 +              }
        }
 -      zend_bailout();
 -      ZEND_VM_NEXT_OPCODE(); /* Never reached */
 -}
 -
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -      USE_OPLINE
 -      zval *value;
 -      zend_free_op free_op1;
  
 -      SAVE_OPLINE();
 -      value = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 -try_strlen:
 -      if (EXPECTED(Z_TYPE_P(value) == IS_STRING)) {
 -              ZVAL_LONG(EX_VAR(opline->result.var), Z_STRLEN_P(value));
 -      } else {
 -              zend_bool strict;
 +      if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 +              offset = GET_OP2_UNDEF_CV(offset, BP_VAR_R);
 +      }
  
 -              if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(value) == IS_UNDEF)) {
 -                      value = GET_OP1_UNDEF_CV(value, BP_VAR_R);
 -              }
 -              if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) && Z_TYPE_P(value) == IS_REFERENCE) {
 -                      value = Z_REFVAL_P(value);
 -                      goto try_strlen;
 +      if (((IS_TMP_VAR|IS_VAR) != IS_CONST && EXPECTED(Z_TYPE_P(container) == IS_OBJECT))) {
 +              if (EXPECTED(Z_OBJ_HT_P(container)->has_dimension)) {
 +                      result =
 +                              ((opline->extended_value & ZEND_ISSET) == 0) ^
 +                              Z_OBJ_HT_P(container)->has_dimension(container, offset, (opline->extended_value & ZEND_ISSET) == 0);
 +              } else {
 +                      zend_error(E_NOTICE, "Trying to check element of non-array");
 +                      goto isset_not_found;
                }
 -              strict = EX_USES_STRICT_TYPES();
 -              do {
 -                      if (EXPECTED(!strict)) {
 -                              zend_string *str;
 -                              zval tmp;
 +      } else if (EXPECTED(Z_TYPE_P(container) == IS_STRING)) { /* string offsets */
 +              zend_long lval;
  
 -                              ZVAL_COPY(&tmp, value);
 -                              if (zend_parse_arg_str_weak(&tmp, &str)) {
 -                                      ZVAL_LONG(EX_VAR(opline->result.var), ZSTR_LEN(str));
 -                                      zval_ptr_dtor(&tmp);
 -                                      break;
 +              if (EXPECTED(Z_TYPE_P(offset) == IS_LONG)) {
 +                      lval = Z_LVAL_P(offset);
 +isset_str_offset:
 +                      if (UNEXPECTED(lval < 0)) { /* Handle negative offset */
 +                              lval += (zend_long)Z_STRLEN_P(container);
 +                      }
 +                      if (EXPECTED(lval >= 0) && (size_t)lval < Z_STRLEN_P(container)) {
 +                              if (opline->extended_value & ZEND_ISSET) {
 +                                      result = 1;
 +                              } else {
 +                                      result = (Z_STRVAL_P(container)[lval] == '0');
                                }
 -                              zval_ptr_dtor(&tmp);
 +                      } else {
 +                              goto isset_not_found;
                        }
 -                      zend_internal_type_error(strict, "strlen() expects parameter 1 to be string, %s given", zend_get_type_by_const(Z_TYPE_P(value)));
 -                      ZVAL_NULL(EX_VAR(opline->result.var));
 -              } while (0);
 +              } else {
 +                      if (IS_CONST & (IS_CV|IS_VAR)) {
 +                              ZVAL_DEREF(offset);
 +                      }
 +                      if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
 +                                      || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 +                                              && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 +                              lval = zval_get_long(offset);
 +                              goto isset_str_offset;
 +                      }
 +                      goto isset_not_found;
 +              }
 +      } else {
 +isset_not_found:
 +              result = ((opline->extended_value & ZEND_ISSET) == 0);
        }
 +
 +isset_dim_obj_exit:
 +
        zval_ptr_dtor_nogc(free_op1);
 +      ZEND_VM_SMART_BRANCH(result, 1);
 +      ZVAL_BOOL(EX_VAR(opline->result.var), result);
        ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
  }
  
@@@ -55117,220 -43287,137 +55249,224 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
                }
        }
  
 -      if ((IS_TMP_VAR|IS_VAR) != IS_CONST) {
 -              zend_string_release(name);
 +      call_info = ZEND_CALL_NESTED_FUNCTION;
 +      if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_STATIC) != 0)) {
 +              obj = NULL;
 +      } else if ((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_TMP_VAR|IS_CV)) {
 +              /* CV may be changed indirectly (e.g. when it's a reference) */
 +              call_info = ZEND_CALL_NESTED_FUNCTION | ZEND_CALL_RELEASE_THIS;
 +              GC_REFCOUNT(obj)++; /* For $this pointer */
        }
  
 -fetch_var_return:
 -      ZEND_ASSERT(retval != NULL);
 -      if (type == BP_VAR_R || type == BP_VAR_IS) {
 -              if (/*type == BP_VAR_R &&*/ Z_ISREF_P(retval) && Z_REFCOUNT_P(retval) == 1) {
 -                      ZVAL_UNREF(retval);
 -              }
 -              ZVAL_COPY(EX_VAR(opline->result.var), retval);
 -      } else {
 -              ZVAL_INDIRECT(EX_VAR(opline->result.var), retval);
 -      }
 -      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 -}
++      zval_ptr_dtor_nogc(free_op1);
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_R_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -      ZEND_VM_TAIL_CALL(zend_fetch_var_address_helper_SPEC_TMPVAR_UNUSED(BP_VAR_R ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -}
++      if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_TMP_VAR)) && UNEXPECTED(EG(exception))) {
++              HANDLE_EXCEPTION();
++      }
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_W_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -      ZEND_VM_TAIL_CALL(zend_fetch_var_address_helper_SPEC_TMPVAR_UNUSED(BP_VAR_W ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -}
 +      call = zend_vm_stack_push_call_frame(call_info,
 +              fbc, opline->extended_value, called_scope, obj);
 +      call->prev_execute_data = EX(call);
 +      EX(call) = call;
  
-       zval_ptr_dtor_nogc(free_op1);
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_RW_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -      ZEND_VM_TAIL_CALL(zend_fetch_var_address_helper_SPEC_TMPVAR_UNUSED(BP_VAR_RW ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
++      ZEND_VM_NEXT_OPCODE();
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_FUNC_ARG_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_TMPVAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
        USE_OPLINE
 +      zend_free_op free_op1;
 +      zval *op1, *op2, *result;
  
 -      if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) {
 -              ZEND_VM_TAIL_CALL(zend_fetch_var_address_helper_SPEC_TMPVAR_UNUSED(BP_VAR_W ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      } else {
 -              ZEND_VM_TAIL_CALL(zend_fetch_var_address_helper_SPEC_TMPVAR_UNUSED(BP_VAR_R ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -      }
 -}
 +      op1 = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +      op2 = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
 +      do {
 +              int result;
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_UNSET_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -      ZEND_VM_TAIL_CALL(zend_fetch_var_address_helper_SPEC_TMPVAR_UNUSED(BP_VAR_UNSET ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 -}
 +              if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
 +                      if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
 +                              result = (Z_LVAL_P(op1) == Z_LVAL_P(op2));
 +                      } else if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
 +                              result = ((double)Z_LVAL_P(op1) == Z_DVAL_P(op2));
 +                      } else {
 +                              break;
 +                      }
 +              } else if (EXPECTED(Z_TYPE_P(op1) == IS_DOUBLE)) {
 +                      if (EXPECTED(Z_TYPE_P(op2) == IS_DOUBLE)) {
 +                              result = (Z_DVAL_P(op1) == Z_DVAL_P(op2));
 +                      } else if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
 +                              result = (Z_DVAL_P(op1) == ((double)Z_LVAL_P(op2)));
 +                      } else {
 +                              break;
 +                      }
 +              } else if (EXPECTED(Z_TYPE_P(op1) == IS_STRING)) {
 +                      if (EXPECTED(Z_TYPE_P(op2) == IS_STRING)) {
 +                              if (Z_STR_P(op1) == Z_STR_P(op2)) {
 +                                      result = 1;
 +                              } else if (Z_STRVAL_P(op1)[0] > '9' || Z_STRVAL_P(op2)[0] > '9') {
 +                                      if (Z_STRLEN_P(op1) != Z_STRLEN_P(op2)) {
 +                                              result = 0;
 +                                      } else {
 +                                              result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0);
 +                                      }
 +                              } else {
 +                                      result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0);
 +                              }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_IS_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 -{
 -      ZEND_VM_TAIL_CALL(zend_fetch_var_address_helper_SPEC_TMPVAR_UNUSED(BP_VAR_IS ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +                      } else {
 +                              break;
 +                      }
 +              } else {
 +                      break;
 +              }
 +              ZEND_VM_SMART_BRANCH(result, 0);
 +              ZVAL_BOOL(EX_VAR(opline->result.var), result);
 +              ZEND_VM_NEXT_OPCODE();
 +      } while (0);
 +
 +      SAVE_OPLINE();
 +      if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
 +              op1 = GET_OP1_UNDEF_CV(op1, BP_VAR_R);
 +      }
 +      if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op2) == IS_UNDEF)) {
 +              op2 = GET_OP2_UNDEF_CV(op2, BP_VAR_R);
 +      }
 +      result = EX_VAR(opline->result.var);
 +      compare_function(result, op1, op2);
 +      ZVAL_BOOL(result, Z_LVAL_P(result) == 0);
 +
 +      ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_VAR_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_TMPVAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
        USE_OPLINE
 -      zval tmp, *varname;
 -      HashTable *target_symbol_table;
        zend_free_op free_op1;
 +      zval *container;
 +      int result;
 +      zend_ulong hval;
 +      zval *offset;
  
        SAVE_OPLINE();
 -      if ((IS_TMP_VAR|IS_VAR) == IS_CV &&
 -          IS_UNUSED == IS_UNUSED &&
 -          (opline->extended_value & ZEND_QUICK_SET)) {
 -              zval *var = EX_VAR(opline->op1.var);
 +      container = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
 +      offset = _get_zval_ptr_cv_undef(execute_data, opline->op2.var);
  
 -              if (Z_REFCOUNTED_P(var)) {
 -                      zend_refcounted *garbage = Z_COUNTED_P(var);
 +      if (EXPECTED(Z_TYPE_P(container) == IS_ARRAY)) {
 +              HashTable *ht;
 +              zval *value;
 +              zend_string *str;
  
 -                      if (!--GC_REFCOUNT(garbage)) {
 -                              ZVAL_UNDEF(var);
 -                              zval_dtor_func_for_ptr(garbage);
 -                      } else {
 -                              zval *z = var;
 -                              ZVAL_DEREF(z);
 -                              if (Z_COLLECTABLE_P(z) && UNEXPECTED(!Z_GC_INFO_P(z))) {
 -                                      ZVAL_UNDEF(var);
 -                                      gc_possible_root(Z_COUNTED_P(z));
 -                              } else {
 -                                      ZVAL_UNDEF(var);
 +isset_dim_obj_array:
 +              ht = Z_ARRVAL_P(container);
 +isset_again:
 +              if (EXPECTED(Z_TYPE_P(offset) == IS_STRING)) {
 +                      str = Z_STR_P(offset);
 +                      if (IS_CV != IS_CONST) {
 +                              if (ZEND_HANDLE_NUMERIC(str, hval)) {
 +                                      goto num_index_prop;
                                }
                        }
 +str_index_prop:
 +                      value = zend_hash_find_ind(ht, str);
 +              } else if (EXPECTED(Z_TYPE_P(offset) == IS_LONG)) {
 +                      hval = Z_LVAL_P(offset);
 +num_index_prop:
 +                      value = zend_hash_index_find(ht, hval);
 +              } else if ((IS_CV & (IS_VAR|IS_CV)) && EXPECTED(Z_ISREF_P(offset))) {
 +                      offset = Z_REFVAL_P(offset);
 +                      goto isset_again;
 +              } else if (Z_TYPE_P(offset) == IS_DOUBLE) {
 +                      hval = zend_dval_to_lval(Z_DVAL_P(offset));
 +                      goto num_index_prop;
 +              } else if (Z_TYPE_P(offset) == IS_NULL) {
 +                      str = ZSTR_EMPTY_ALLOC();
 +                      goto str_index_prop;
 +              } else if (Z_TYPE_P(offset) == IS_FALSE) {
 +                      hval = 0;
 +                      goto num_index_prop;
 +              } else if (Z_TYPE_P(offset) == IS_TRUE) {
 +                      hval = 1;
 +                      goto num_index_prop;
 +              } else if (Z_TYPE_P(offset) == IS_RESOURCE) {
 +                      hval = Z_RES_HANDLE_P(offset);
 +                      goto num_index_prop;
 +              } else if (IS_CV == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
 +                      GET_OP2_UNDEF_CV(offset, BP_VAR_R);
 +                      str = ZSTR_EMPTY_ALLOC();
 +                      goto str_index_prop;
                } else {
 -                      ZVAL_UNDEF(var);
 +                      zend_error(E_WARNING, "Illegal offset type in isset or empty");
 +                      goto isset_not_found;
                }
 -              ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 -      }
 -
 -      varname = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
  
 -      ZVAL_UNDEF(&tmp);
 -      if ((IS_TMP_VAR|IS_VAR) != IS_CONST && Z_TYPE_P(varname) != IS_STRING) {
 -              if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(varname) == IS_UNDEF)) {
 -                      varname = GET_OP1_UNDEF_CV(varname, BP_VAR_R);
 +              if (opline->extended_value & ZEND_ISSET) {
 +                      /* > IS_NULL means not IS_UNDEF and not IS_NULL */
 +                      result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
 +                          (!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
 +              } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
 +                      result = (value == NULL || !i_zend_is_true(value));
 +              }
 +              goto isset_dim_obj_exit;
 +      } else if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) && Z_ISREF_P(container)) {
 +              container = Z_REFVAL_P(container);
 +              if (EXPECTED(Z_TYPE_P(container) == IS_ARRAY)) {
 +                      goto isset_dim_obj_array;
                }
 -              ZVAL_STR(&tmp, zval_get_string(varname));
 -              varname = &tmp;
        }
  
 -      if (IS_UNUSED != IS_UNUSED) {
 -              zend_class_entry *ce;
 +      if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 +              offset = GET_OP2_UNDEF_CV(offset, BP_VAR_R);
 +      }
  
 -              if (IS_UNUSED == IS_CONST) {
 -                      ce = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)));
 -                      if (UNEXPECTED(ce == NULL)) {
 -                              ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op2)), EX_CONSTANT(opline->op2) + 1, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
 -                              if (UNEXPECTED(ce == NULL)) {
 -                                      if (EXPECTED(!EG(exception))) {
 -                                              zend_throw_error(NULL, "Class '%s' not found", Z_STRVAL_P(EX_CONSTANT(opline->op2)));
 -                                      }
 -                                      if ((IS_TMP_VAR|IS_VAR) != IS_CONST && Z_TYPE(tmp) != IS_UNDEF) {
 -                                              zend_string_release(Z_STR(tmp));
 -                                      }
 -                                      zval_ptr_dtor_nogc(free_op1);
 -                                      HANDLE_EXCEPTION();
 +      if (((IS_TMP_VAR|IS_VAR) != IS_CONST && EXPECTED(Z_TYPE_P(container) == IS_OBJECT))) {
 +              if (EXPECTED(Z_OBJ_HT_P(container)->has_dimension)) {
 +                      result =
 +                              ((opline->extended_value & ZEND_ISSET) == 0) ^
 +                              Z_OBJ_HT_P(container)->has_dimension(container, offset, (opline->extended_value & ZEND_ISSET) == 0);
 +              } else {
 +                      zend_error(E_NOTICE, "Trying to check element of non-array");
 +                      goto isset_not_found;
 +              }
 +      } else if (EXPECTED(Z_TYPE_P(container) == IS_STRING)) { /* string offsets */
 +              zend_long lval;
 +
 +              if (EXPECTED(Z_TYPE_P(offset) == IS_LONG)) {
 +                      lval = Z_LVAL_P(offset);
 +isset_str_offset:
 +                      if (UNEXPECTED(lval < 0)) { /* Handle negative offset */
 +                              lval += (zend_long)Z_STRLEN_P(container);
 +                      }
 +                      if (EXPECTED(lval >= 0) && (size_t)lval < Z_STRLEN_P(container)) {
 +                              if (opline->extended_value & ZEND_ISSET) {
 +                                      result = 1;
 +                              } else {
 +                                      result = (Z_STRVAL_P(container)[lval] == '0');
                                }
 -                              CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce);
 +                      } else {
 +                              goto isset_not_found;
                        }
                } else {
 -                      ce = Z_CE_P(EX_VAR(opline->op2.var));
 +                      if (IS_CV & (IS_CV|IS_VAR)) {
 +                              ZVAL_DEREF(offset);
 +                      }
 +                      if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
 +                                      || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
 +                                              && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
 +                              lval = zval_get_long(offset);
 +                              goto isset_str_offset;
 +                      }
 +                      goto isset_not_found;
                }
 -              zend_std_unset_static_property(ce, Z_STR_P(varname));
        } else {
 -              target_symbol_table = zend_get_target_symbol_table(execute_data, opline->extended_value & ZEND_FETCH_TYPE_MASK);
 -              zend_hash_del_ind(target_symbol_table, Z_STR_P(varname));
 +isset_not_found:
 +              result = ((opline->extended_value & ZEND_ISSET) == 0);
        }
  
 -      if ((IS_TMP_VAR|IS_VAR) != IS_CONST && Z_TYPE(tmp) != IS_UNDEF) {
 -              zend_string_release(Z_STR(tmp));
 -      }
 +isset_dim_obj_exit:
 +
        zval_ptr_dtor_nogc(free_op1);
 +      ZEND_VM_SMART_BRANCH(result, 1);
 +      ZVAL_BOOL(EX_VAR(opline->result.var), result);
        ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
  }
  
@@@ -56407,21 -44399,24 +56543,25 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
                GC_REFCOUNT(obj)++; /* For $this pointer */
        }
  
++      zval_ptr_dtor_nogc(free_op2);
+       zval_ptr_dtor_nogc(free_op1);
+       if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_TMP_VAR)) && UNEXPECTED(EG(exception))) {
+               HANDLE_EXCEPTION();
+       }
        call = zend_vm_stack_push_call_frame(call_info,
                fbc, opline->extended_value, called_scope, obj);
        call->prev_execute_data = EX(call);
        EX(call) = call;
  
-       zval_ptr_dtor_nogc(free_op2);
-       zval_ptr_dtor_nogc(free_op1);
-       ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+       ZEND_VM_NEXT_OPCODE();
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_TMPVAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_TMPVAR_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
        USE_OPLINE
 -      zend_free_op free_op1;
 +      zend_free_op free_op1, free_op2;
        zval *op1, *op2, *result;
  
        op1 = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);