Voidify zend_mark_cv_references()

Girgias · Girgias · commit 25deb7d25446 · 2021-09-21T11:35:53.000+01:00
It always returned SUCCESS
diff --git a/Zend/Optimizer/zend_inference.c b/Zend/Optimizer/zend_inference.c
@@ -4357,7 +4357,7 @@ static zend_result zend_infer_types(const zend_op_array *op_array, const zend_sc
 	return SUCCESS;
 }
 
-static int zend_mark_cv_references(const zend_op_array *op_array, const zend_script *script, zend_ssa *ssa)
+static void zend_mark_cv_references(const zend_op_array *op_array, const zend_script *script, zend_ssa *ssa)
 {
 	int var, def;
 	const zend_op *opline;
@@ -4492,7 +4492,6 @@ static int zend_mark_cv_references(const zend_op_array *op_array, const zend_scr
 	} WHILE_WORKLIST_END();
 
 	free_alloca(worklist,  use_heap);
-	return SUCCESS;
 }
 
 ZEND_API zend_result zend_ssa_inference(zend_arena **arena, const zend_op_array *op_array, const zend_script *script, zend_ssa *ssa, zend_long optimization_level) /* {{{ */
@@ -4524,9 +4523,7 @@ ZEND_API zend_result zend_ssa_inference(zend_arena **arena, const zend_op_array
 		ssa_var_info[i].has_range = 0;
 	}
 
-	if (zend_mark_cv_references(op_array, script, ssa) != SUCCESS) {
-		return FAILURE;
-	}
+	zend_mark_cv_references(op_array, script, ssa);
 
 	zend_infer_ranges(op_array, ssa);
 

Original file line number	Diff line number	Diff line change
`@@ -4357,7 +4357,7 @@ static zend_result zend_infer_types(const zend_op_array *op_array, const zend_sc`
`4357`	`4357`	`return SUCCESS;`
`4358`	`4358`	`}`
`4359`	`4359`
`4360`		`-static int zend_mark_cv_references(const zend_op_array op_array, const zend_script script, zend_ssa *ssa)`
	`4360`	`+static void zend_mark_cv_references(const zend_op_array op_array, const zend_script script, zend_ssa *ssa)`
`4361`	`4361`	`{`
`4362`	`4362`	`int var, def;`
`4363`	`4363`	`const zend_op *opline;`
`@@ -4492,7 +4492,6 @@ static int zend_mark_cv_references(const zend_op_array *op_array, const zend_scr`
`4492`	`4492`	`} WHILE_WORKLIST_END();`
`4493`	`4493`
`4494`	`4494`	`free_alloca(worklist, use_heap);`
`4495`		`- return SUCCESS;`
`4496`	`4495`	`}`
`4497`	`4496`
`4498`	`4497`	`ZEND_API zend_result zend_ssa_inference(zend_arena *arena, const zend_op_array op_array, const zend_script script, zend_ssa ssa, zend_long optimization_level) /* {{{ */`
`@@ -4524,9 +4523,7 @@ ZEND_API zend_result zend_ssa_inference(zend_arena **arena, const zend_op_array`
`4524`	`4523`	`ssa_var_info[i].has_range = 0;`
`4525`	`4524`	`}`
`4526`	`4525`
`4527`		`- if (zend_mark_cv_references(op_array, script, ssa) != SUCCESS) {`
`4528`		`- return FAILURE;`
`4529`		`- }`
	`4526`	`+ zend_mark_cv_references(op_array, script, ssa);`
`4530`	`4527`
`4531`	`4528`	`zend_infer_ranges(op_array, ssa);`
`4532`	`4529`