- Drop a few superflous if conditions

diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index 0e129edec53f723d8a814391ab5b937967d5d433..a78678f60e40ac0a197dc7b086d6e29f7447d8eb 100755 (executable)
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
@@ -222,15 +222,14 @@ ZEND_API int zend_user_it_get_current_key(zend_object_iterator *_iter, zstr *str
                        return HASH_KEY_IS_UNICODE;
 
                case IS_DOUBLE:
+                       *int_key = (long)Z_DVAL_P(retval);
+                       zval_ptr_dtor(&retval);
+                       return HASH_KEY_IS_LONG;
+
                case IS_RESOURCE:
                case IS_BOOL:
-               case IS_LONG: {
-                               if (Z_TYPE_P(retval) == IS_DOUBLE) {
-                                       *int_key = (long)Z_DVAL_P(retval);
-                               } else {
-                                       *int_key = Z_LVAL_P(retval);
-                               }
-                       }
+               case IS_LONG:
+                       *int_key = (long)Z_LVAL_P(retval);
                        zval_ptr_dtor(&retval);
                        return HASH_KEY_IS_LONG;
        }

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 0f19daffedc6726656dd2084b32b88eb413d2668..5889bcfc0eab2fc760210c6b2318b589d4394804 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1572,8 +1572,8 @@ ZEND_VM_HANDLER(54, ZEND_ADD_CHAR, TMP, CONST)
        zend_free_op free_op1;
 
        add_char_to_string(&EX_T(opline->result.u.var).tmp_var,
-                                          GET_OP1_ZVAL_PTR(BP_VAR_NA),
-                                          &opline->op2.u.constant);
+               GET_OP1_ZVAL_PTR(BP_VAR_NA),
+               &opline->op2.u.constant);
        /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */
        ZEND_VM_NEXT_OPCODE();
 }
@@ -1584,8 +1584,8 @@ ZEND_VM_HANDLER(55, ZEND_ADD_STRING, TMP, CONST)
        zend_free_op free_op1;
 
        add_string_to_string(&EX_T(opline->result.u.var).tmp_var,
-                                                GET_OP1_ZVAL_PTR(BP_VAR_NA),
-                                                &opline->op2.u.constant);
+               GET_OP1_ZVAL_PTR(BP_VAR_NA),
+               &opline->op2.u.constant);
        /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2894,8 +2894,8 @@ ZEND_VM_HANDLER(74, ZEND_UNSET_VAR, CONST|TMP|VAR|CV, ANY)
                                                }
                                        }
                                }
-                 ex = ex->prev_execute_data;
-                 } while (ex && ex->symbol_table == target_symbol_table);
+                               ex = ex->prev_execute_data;
+                       } while (ex && ex->symbol_table == target_symbol_table);
                }
        }
 
@@ -2924,15 +2924,13 @@ ZEND_VM_HANDLER(75, ZEND_UNSET_DIM, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
 
                                switch (Z_TYPE_P(offset)) {
                                        case IS_DOUBLE:
+                                               index = (long) Z_DVAL_P(offset);
+                                               zend_hash_index_del(ht, index);
+                                               break;
                                        case IS_RESOURCE:
                                        case IS_BOOL:
                                        case IS_LONG:
-                                               if (Z_TYPE_P(offset) == IS_DOUBLE) {
-                                                       index = (long) Z_DVAL_P(offset);
-                                               } else {
-                                                       index = Z_LVAL_P(offset);
-                                               }
-
+                                               index = Z_LVAL_P(offset);
                                                zend_hash_index_del(ht, index);
                                                break;
                                        case IS_STRING:
@@ -3417,14 +3415,15 @@ ZEND_VM_HELPER_EX(zend_isset_isempty_dim_prop_obj_handler, VAR|UNUSED|CV, CONST|
 
                        switch (Z_TYPE_P(offset)) {
                                case IS_DOUBLE:
+                                       index = (long) Z_DVAL_P(offset);
+                                       if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+                                               isset = 1;
+                                       }
+                                       break;
                                case IS_RESOURCE:
                                case IS_BOOL:
                                case IS_LONG:
-                                       if (Z_TYPE_P(offset) == IS_DOUBLE) {
-                                               index = (long) Z_DVAL_P(offset);
-                                       } else {
-                                               index = Z_LVAL_P(offset);
-                                       }
+                                       index = Z_LVAL_P(offset);
                                        if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
                                                isset = 1;
                                        }