Merge pull request #12 from php/master

sync

Author: chopins

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,36 @@
+name: Bug report
+description: Create a bug report
+labels: ["Bug", "Status: Needs Triage"]
+body:
+  - type: textarea
+    attributes:
+      label: Description
+      description: "Please provide a minimal way to reproduce the problem and describe what the expected vs actual behavior is. Provide a [3v4l.org](https://3v4l.org/) link if possible."
+      value: |
+        The following code:
+
+        ```php
+        <?php
+        ```
+
+        Resulted in this output:
+        ```
+        ```
+
+        But I expected this output instead:
+        ```
+        ```
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: PHP Version
+      description: "The used PHP version. Make sure it is [supported](https://www.php.net/supported-versions.php)."
+      placeholder: "PHP 8.0.12"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Operating System
+      description: "The used operating system, if relevant."
+      placeholder: "Ubuntu 20.04"

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Documentation issue
+    url: https://github.com/php/doc-en/issues
+    about: Please report documentation issues on the doc-en repository.
+  - name: Security issue
+    url: https://bugs.php.net/report.php?security_bug
+    about: Please report security issues in this private bug tracker.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,10 @@
+name: Feature request
+description: Create a feature request
+labels: ["Feature", "Status: Needs Triage"]
+body:
+  - type: textarea
+    attributes:
+      label: Description
+      description: "Please describe the requested feature and why it should be included in PHP."
+    validations:
+      required: true

.github/workflows/close-needs-feedback.yml

@@ -0,0 +1,17 @@
+name: Close old issues that need feedback
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Close old issues that need feedback
+        uses: dwieeb/needs-reply@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          issue-label: "Status: Needs Feedback"
+          days-before-close: 14
+          close-message: "No feedback was provided. The issue is being suspended because we assume that you are no longer experiencing the problem. If this is not the case and you are able to provide the information that was requested earlier, please do so. Thank you."

.github/workflows/remove-needs-feedback.yml

@@ -0,0 +1,15 @@
+name: Remove needs feedback label
+
+on:
+  issue_comment:
+    types:
+      - created
+
+jobs:
+  build:
+    if: "contains(github.event.issue.labels.*.name, 'Status: Needs Feedback') && github.event.issue.user.login == github.event.sender.login"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions-ecosystem/action-remove-labels@v1
+        with:
+          labels: "Status: Needs Feedback"

NEWS

@@ -14,6 +14,10 @@ PHP                                                                        NEWS
 - OCI8:
   . Added oci8.prefetch_lob_size directive to tune LOB query performance
 
+- Standard:
+  . net_get_interfaces() also reports wireless network interfaces on Windows.
+    (Yurun)
+
 - Zip:
   . add ZipArchive::clearError() method
   . add ZipArchive::getStreamName() method

TSRM/TSRM.h

@@ -167,8 +167,10 @@ TSRM_API const char *tsrm_api_name(void);
 #define TSRMG_BULK_STATIC(id, type)	((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])
 #define TSRMG_FAST_STATIC(offset, type, element)	(TSRMG_FAST_BULK_STATIC(offset, type)->element)
 #define TSRMG_FAST_BULK_STATIC(offset, type)	((type) (((char*) TSRMLS_CACHE)+(offset)))
-#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE TSRM_TLS_MODEL_ATTR;
-#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE TSRM_TLS_MODEL_ATTR = NULL;
+#define TSRMLS_MAIN_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE TSRM_TLS_MODEL_ATTR;
+#define TSRMLS_MAIN_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE TSRM_TLS_MODEL_ATTR = NULL;
+#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
+#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
 #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
 #define TSRMLS_CACHE _tsrm_ls_cache
 
@@ -182,6 +184,8 @@ TSRM_API const char *tsrm_api_name(void);
 #define tsrm_env_unlock()
 
 #define TSRMG_STATIC(id, type, element)
+#define TSRMLS_MAIN_CACHE_EXTERN()
+#define TSRMLS_MAIN_CACHE_DEFINE()
 #define TSRMLS_CACHE_EXTERN()
 #define TSRMLS_CACHE_DEFINE()
 #define TSRMLS_CACHE_UPDATE()

UPGRADING

@@ -48,6 +48,16 @@ PHP 8.2 UPGRADE NOTES
 ========================================
 
 - Core:
+  . Creation of dynamic properties is deprecated, unless the class opts in by
+    using the #[AllowDynamicProperties] attribute. stdClass allows dynamic
+    properties. Usage of __get()/__set() is not affected by this change. A
+    dynamic properties deprecation warning can be addressed by:
+     - Declaring the property (preferred).
+     - Adding the #[AllowDynamicProperties] attribute to the class (which also
+       applies to all child classes).
+     - Using a WeakMap if you wish to associate additional data with an object
+       you do not own.
+
   . Callables that are not accepted by the $callable() syntax (but are accepted
     by call_user_func) are deprecated. In particular:
 

Zend/Optimizer/dce.c

@@ -111,7 +111,6 @@ static inline bool may_have_side_effects(
 		case ZEND_ROPE_INIT:
 		case ZEND_ROPE_ADD:
 		case ZEND_INIT_ARRAY:
-		case ZEND_ADD_ARRAY_ELEMENT:
 		case ZEND_SPACESHIP:
 		case ZEND_STRLEN:
 		case ZEND_COUNT:
@@ -128,6 +127,12 @@ static inline bool may_have_side_effects(
 		case ZEND_ARRAY_KEY_EXISTS:
 			/* No side effects */
 			return 0;
+		case ZEND_ADD_ARRAY_ELEMENT:
+			/* TODO: We can't free two vars. Keep instruction alive. <?php [0, "$a" => "$b"]; */
+			if ((opline->op1_type & (IS_VAR|IS_TMP_VAR)) && (opline->op2_type & (IS_VAR|IS_TMP_VAR))) {
+				return 1;
+			}
+			return 0;
 		case ZEND_ROPE_END:
 			/* TODO: Rope dce optimization, see #76446 */
 			return 1;
@@ -514,6 +519,10 @@ static inline bool may_break_varargs(const zend_op_array *op_array, const zend_s
 	return 0;
 }
 
+static inline bool may_throw_dce_exception(const zend_op *opline) {
+	return opline->opcode == ZEND_ADD_ARRAY_ELEMENT && opline->op2_type == IS_UNUSED;
+}
+
 int dce_optimize_op_array(zend_op_array *op_array, zend_ssa *ssa, bool reorder_dtor_effects) {
 	int i;
 	zend_ssa_phi *phi;
@@ -580,7 +589,8 @@ int dce_optimize_op_array(zend_op_array *op_array, zend_ssa *ssa, bool reorder_d
 					add_operands_to_worklists(&ctx, &op_array->opcodes[op_data], &ssa->ops[op_data], ssa, 0);
 				}
 			} else if (may_have_side_effects(op_array, ssa, &op_array->opcodes[i], &ssa->ops[i], ctx.reorder_dtor_effects)
-					|| zend_may_throw(&op_array->opcodes[i], &ssa->ops[i], op_array, ssa)
+					|| (zend_may_throw(&op_array->opcodes[i], &ssa->ops[i], op_array, ssa)
+						&& !may_throw_dce_exception(&op_array->opcodes[i]))
 					|| (has_varargs && may_break_varargs(op_array, ssa, &ssa->ops[i]))) {
 				if (op_array->opcodes[i].opcode == ZEND_NEW
 						&& op_array->opcodes[i+1].opcode == ZEND_DO_FCALL

Zend/Optimizer/dfa_pass.c

@@ -345,19 +345,17 @@ static bool opline_supports_assign_contraction(
 	return 1;
 }
 
-static bool variable_redefined_in_range(zend_ssa *ssa, int var, int start, int end)
+static bool variable_defined_or_used_in_range(zend_ssa *ssa, int var, int start, int end)
 {
 	while (start < end) {
-		if (ssa->ops[start].op1_def >= 0
-		 && ssa->vars[ssa->ops[start].op1_def].var == var) {
-			return 1;
-		}
-		if (ssa->ops[start].op2_def >= 0
-		 && ssa->vars[ssa->ops[start].op2_def].var == var) {
-			return 1;
-		}
-		if (ssa->ops[start].result_def >= 0
-		 && ssa->vars[ssa->ops[start].result_def].var == var) {
+		const zend_ssa_op *ssa_op = &ssa->ops[start];
+		if ((ssa_op->op1_def >= 0 && ssa->vars[ssa_op->op1_def].var == var) ||
+			(ssa_op->op2_def >= 0 && ssa->vars[ssa_op->op2_def].var == var) ||
+			(ssa_op->result_def >= 0 && ssa->vars[ssa_op->result_def].var == var) ||
+			(ssa_op->op1_use >= 0 && ssa->vars[ssa_op->op1_use].var == var) ||
+			(ssa_op->op2_use >= 0 && ssa->vars[ssa_op->op2_use].var == var) ||
+			(ssa_op->result_use >= 0 && ssa->vars[ssa_op->result_use].var == var)
+		) {
 			return 1;
 		}
 		start++;
@@ -1331,7 +1329,7 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
 				 && opline_supports_assign_contraction(
 					 ssa, &op_array->opcodes[ssa->vars[src_var].definition],
 					 src_var, opline->result.var)
-				 && !variable_redefined_in_range(ssa, EX_VAR_TO_NUM(opline->result.var),
+				 && !variable_defined_or_used_in_range(ssa, EX_VAR_TO_NUM(opline->result.var),
 						ssa->vars[src_var].definition+1, op_1)
 				) {
 
@@ -1490,7 +1488,7 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
 					 && opline_supports_assign_contraction(
 						 ssa, &op_array->opcodes[ssa->vars[src_var].definition],
 						 src_var, opline->op1.var)
-					 && !variable_redefined_in_range(ssa, EX_VAR_TO_NUM(opline->op1.var),
+					 && !variable_defined_or_used_in_range(ssa, EX_VAR_TO_NUM(opline->op1.var),
 							ssa->vars[src_var].definition+1, op_1)
 					) {
 

Zend/Optimizer/sccp.c

@@ -1101,7 +1101,9 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op *ssa_o
 
 				/* Don't try to propagate assignments to (potentially) typed properties. We would
 				 * need to deal with errors and type conversions first. */
-				if (!var_info->ce || (var_info->ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS)) {
+				// TODO: Distinguish dynamic and declared property assignments here?
+				if (!var_info->ce || (var_info->ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS) ||
+						!(var_info->ce->ce_flags & ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES)) {
 					SET_RESULT_BOT(result);
 					SET_RESULT_BOT(op1);
 					return;
@@ -2277,6 +2279,12 @@ static int try_remove_definition(sccp_ctx *ctx, int var_num, zend_ssa_var *var,
 							return 0;
 						}
 						break;
+					case ZEND_INIT_ARRAY:
+					case ZEND_ADD_ARRAY_ELEMENT:
+						if (opline->op2_type == IS_UNUSED) {
+							return 0;
+						}
+						/* break missing intentionally */
 					default:
 						if (zend_may_throw(opline, ssa_op, op_array, ssa)) {
 							return 0;

Zend/Optimizer/scdf.c

@@ -224,29 +224,32 @@ static uint32_t cleanup_loop_var_free_block(scdf_ctx *scdf, zend_basic_block *bl
 	zend_ssa *ssa = scdf->ssa;
 	const zend_op_array *op_array = scdf->op_array;
 	const zend_cfg *cfg = &ssa->cfg;
+	int block_num = block - cfg->blocks;
 	uint32_t removed_ops = 0;
 
 	/* Removes phi nodes */
-	for (zend_ssa_phi *phi = ssa->blocks[block - cfg->blocks].phis; phi; phi = phi->next) {
+	for (zend_ssa_phi *phi = ssa->blocks[block_num].phis; phi; phi = phi->next) {
 		zend_ssa_remove_uses_of_var(ssa, phi->ssa_var);
 		zend_ssa_remove_phi(ssa, phi);
 	}
 
 	for (uint32_t i = block->start; i < block->start + block->len; i++) {
 		zend_op *opline = &op_array->opcodes[i];
 		zend_ssa_op *ssa_op = &scdf->ssa->ops[i];
-		if (is_live_loop_var_free(scdf, opline, ssa_op)) {
+		if (opline->opcode == ZEND_NOP
+		 || is_live_loop_var_free(scdf, opline, ssa_op)) {
 			continue;
 		}
 
 		/* While we have to preserve the loop var free, we can still remove other instructions
 		 * in the block. */
 		zend_ssa_remove_defs_of_instr(ssa, ssa_op);
 		zend_ssa_remove_instr(ssa, opline, ssa_op);
+		removed_ops++;
 	}
 
-	/* This block has no predecessors anymore. */
-	block->predecessors_count = 0;
+	zend_ssa_remove_block_from_cfg(ssa, block_num);
+
 	return removed_ops;
 }
 

Zend/Optimizer/ssa_integrity.c

@@ -89,6 +89,11 @@ static inline bool is_var_type(zend_uchar type) {
 	return (type & (IS_CV|IS_VAR|IS_TMP_VAR)) != 0;
 }
 
+static inline bool is_defined(const zend_ssa *ssa, const zend_op_array *op_array, int var) {
+	const zend_ssa_var *ssa_var = &ssa->vars[var];
+	return ssa_var->definition >= 0 || ssa_var->definition_phi || var < op_array->last_var;
+}
+
 #define FAIL(...) do { \
 	if (status == SUCCESS) { \
 		fprintf(stderr, "\nIn function %s::%s (%s):\n", \
@@ -209,6 +214,10 @@ void ssa_verify_integrity(zend_op_array *op_array, zend_ssa *ssa, const char *ex
 			if (ssa_op->op1_use >= ssa->vars_count) {
 				FAIL("op1 use %d out of range\n", ssa_op->op1_use);
 			}
+			if (!is_defined(ssa, op_array, ssa_op->op1_use)) {
+				FAIL("op1 use of " VARFMT " in " INSTRFMT " is not defined\n",
+						VAR(ssa_op->op1_use), INSTR(i));
+			}
 			if (!is_in_use_chain(ssa, ssa_op->op1_use, i)) {
 				FAIL("op1 use of " VARFMT " in " INSTRFMT " not in use chain\n",
 						VAR(ssa_op->op1_use), INSTR(i));
@@ -222,6 +231,10 @@ void ssa_verify_integrity(zend_op_array *op_array, zend_ssa *ssa, const char *ex
 			if (ssa_op->op2_use >= ssa->vars_count) {
 				FAIL("op2 use %d out of range\n", ssa_op->op2_use);
 			}
+			if (!is_defined(ssa, op_array, ssa_op->op2_use)) {
+				FAIL("op2 use of " VARFMT " in " INSTRFMT " is not defined\n",
+						VAR(ssa_op->op2_use), INSTR(i));
+			}
 			if (!is_in_use_chain(ssa, ssa_op->op2_use, i)) {
 				FAIL("op2 use of " VARFMT " in " INSTRFMT " not in use chain\n",
 						VAR(ssa_op->op2_use), INSTR(i));
@@ -235,6 +248,10 @@ void ssa_verify_integrity(zend_op_array *op_array, zend_ssa *ssa, const char *ex
 			if (ssa_op->result_use >= ssa->vars_count) {
 				FAIL("result use %d out of range\n", ssa_op->result_use);
 			}
+			if (!is_defined(ssa, op_array, ssa_op->result_use)) {
+				FAIL("result use of " VARFMT " in " INSTRFMT " is not defined\n",
+						VAR(ssa_op->result_use), INSTR(i));
+			}
 			if (!is_in_use_chain(ssa, ssa_op->result_use, i)) {
 				FAIL("result use of " VARFMT " in " INSTRFMT " not in use chain\n",
 					VAR(ssa_op->result_use), INSTR(i));