Handle numeric strings

hikari-no-yume · hikari-no-yume · commit bab758119aec · 2016-03-25T16:32:12.000Z
diff --git a/Zend/tests/list_keyed_constants.phpt b/Zend/tests/list_keyed_constants.phpt
@@ -10,7 +10,7 @@ $arr = [
 
 const COMPILE_TIME_RESOLVABLE = 1;
 
-define('PROBABLY_NOT_COMPILE_TIME_RESOLVABLE', (int)file_get_contents("data:text/plain,2"));
+define('PROBABLY_NOT_COMPILE_TIME_RESOLVABLE', file_get_contents("data:text/plain,2"));
 
 list(
     COMPILE_TIME_RESOLVABLE => $one,
diff --git a/Zend/tests/list_keyed_conversions.phpt b/Zend/tests/list_keyed_conversions.phpt
@@ -12,6 +12,11 @@ $results = [
 list(NULL => $NULL, 1.5 => $float, FALSE => $FALSE, TRUE => $TRUE) = $results;
 var_dump($NULL, $float, $FALSE, $TRUE);
 
+echo PHP_EOL;
+
+list("0" => $zeroString, "1" => $oneString) = $results;
+var_dump($zeroString, $oneString);
+
 list(STDIN => $resource) = [];
 
 ?>
@@ -21,4 +26,7 @@ int(1)
 int(0)
 int(1)
 
+int(0)
+int(1)
+
 Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -2093,6 +2093,11 @@ ZEND_VM_C_LABEL(num_index_list):
 			}
 		} else if (EXPECTED(Z_TYPE_P(offset) == IS_STRING)) {
 			str = Z_STR_P(offset);
+
+			if (ZEND_HANDLE_NUMERIC(str, hval)) {
+				ZEND_VM_C_GOTO(num_index_list);
+			}
+
 ZEND_VM_C_LABEL(str_index_list):
 			value = zend_hash_find(Z_ARRVAL_P(container), str);
 
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -5773,6 +5773,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_LIST_SPEC_CONST_CONST_HA
 			}
 		} else if (EXPECTED(Z_TYPE_P(offset) == IS_STRING)) {
 			str = Z_STR_P(offset);
+
+			if (ZEND_HANDLE_NUMERIC(str, hval)) {
+				goto num_index_list;
+			}
+
 str_index_list:
 			value = zend_hash_find(Z_ARRVAL_P(container), str);
 
@@ -11387,6 +11392,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_LIST_SPEC_CONST_TMPVAR_H
 			}
 		} else if (EXPECTED(Z_TYPE_P(offset) == IS_STRING)) {
 			str = Z_STR_P(offset);
+
+			if (ZEND_HANDLE_NUMERIC(str, hval)) {
+				goto num_index_list;
+			}
+
 str_index_list:
 			value = zend_hash_find(Z_ARRVAL_P(container), str);
 
@@ -38022,6 +38032,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_LIST_SPEC_CV_CONST_HANDL
 			}
 		} else if (EXPECTED(Z_TYPE_P(offset) == IS_STRING)) {
 			str = Z_STR_P(offset);
+
+			if (ZEND_HANDLE_NUMERIC(str, hval)) {
+				goto num_index_list;
+			}
+
 str_index_list:
 			value = zend_hash_find(Z_ARRVAL_P(container), str);
 
@@ -48006,6 +48021,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_LIST_SPEC_CV_TMPVAR_HAND
 			}
 		} else if (EXPECTED(Z_TYPE_P(offset) == IS_STRING)) {
 			str = Z_STR_P(offset);
+
+			if (ZEND_HANDLE_NUMERIC(str, hval)) {
+				goto num_index_list;
+			}
+
 str_index_list:
 			value = zend_hash_find(Z_ARRVAL_P(container), str);
 
@@ -51309,6 +51329,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_LIST_SPEC_TMPVAR_CONST_H
 			}
 		} else if (EXPECTED(Z_TYPE_P(offset) == IS_STRING)) {
 			str = Z_STR_P(offset);
+
+			if (ZEND_HANDLE_NUMERIC(str, hval)) {
+				goto num_index_list;
+			}
+
 str_index_list:
 			value = zend_hash_find(Z_ARRVAL_P(container), str);
 
@@ -54793,6 +54818,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_LIST_SPEC_TMPVAR_TMPVAR_
 			}
 		} else if (EXPECTED(Z_TYPE_P(offset) == IS_STRING)) {
 			str = Z_STR_P(offset);
+
+			if (ZEND_HANDLE_NUMERIC(str, hval)) {
+				goto num_index_list;
+			}
+
 str_index_list:
 			value = zend_hash_find(Z_ARRVAL_P(container), str);
 
