Removed unnecessary checks

dstogov · dstogov · commit 68cfeed70fad · 2014-12-12T21:57:12.000+03:00
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -1666,12 +1666,12 @@ static zend_always_inline void i_init_func_execute_data(zend_execute_data *execu
 		} while (var != end);
 	}
 
-	if (op_array->this_var != -1 && Z_OBJ(EX(This))) {
+	if (op_array->this_var != -1 && EXPECTED(Z_OBJ(EX(This)))) {
 		ZVAL_OBJ(EX_VAR(op_array->this_var), Z_OBJ(EX(This)));
 		GC_REFCOUNT(Z_OBJ(EX(This)))++;
 	}
 
-	if (!op_array->run_time_cache && op_array->last_cache_slot) {
+	if (UNEXPECTED(!op_array->run_time_cache)) {
 		op_array->run_time_cache = zend_arena_calloc(&CG(arena), op_array->last_cache_slot, sizeof(void*));
 	}
 	EX_LOAD_RUN_TIME_CACHE(op_array);
@@ -1691,12 +1691,12 @@ static zend_always_inline void i_init_code_execute_data(zend_execute_data *execu
 
 	zend_attach_symbol_table(execute_data);
 
-	if (op_array->this_var != -1 && Z_OBJ(EX(This))) {
+	if (op_array->this_var != -1 && EXPECTED(Z_OBJ(EX(This)))) {
 		ZVAL_OBJ(EX_VAR(op_array->this_var), Z_OBJ(EX(This)));
 		GC_REFCOUNT(Z_OBJ(EX(This)))++;
 	}
 
-	if (!op_array->run_time_cache && op_array->last_cache_slot) {
+	if (!op_array->run_time_cache) {
 		op_array->run_time_cache = ecalloc(op_array->last_cache_slot, sizeof(void*));
 	}
 	EX_LOAD_RUN_TIME_CACHE(op_array);
@@ -1762,12 +1762,12 @@ static zend_always_inline void i_init_execute_data(zend_execute_data *execute_da
 		}
 	}
 
-	if (op_array->this_var != -1 && Z_OBJ(EX(This))) {
+	if (op_array->this_var != -1 && EXPECTED(Z_OBJ(EX(This)))) {
 		ZVAL_OBJ(EX_VAR(op_array->this_var), Z_OBJ(EX(This)));
 		GC_REFCOUNT(Z_OBJ(EX(This)))++;
 	}
 
-	if (!op_array->run_time_cache && op_array->last_cache_slot) {
+	if (!op_array->run_time_cache) {
 		if (op_array->function_name) {
 			op_array->run_time_cache = zend_arena_calloc(&CG(arena), op_array->last_cache_slot, sizeof(void*));
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -1666,12 +1666,12 @@ static zend_always_inline void i_init_func_execute_data(zend_execute_data *execu`
`1666`	`1666`	`} while (var != end);`
`1667`	`1667`	`}`
`1668`	`1668`
`1669`		`- if (op_array->this_var != -1 && Z_OBJ(EX(This))) {`
	`1669`	`+ if (op_array->this_var != -1 && EXPECTED(Z_OBJ(EX(This)))) {`
`1670`	`1670`	`ZVAL_OBJ(EX_VAR(op_array->this_var), Z_OBJ(EX(This)));`
`1671`	`1671`	`GC_REFCOUNT(Z_OBJ(EX(This)))++;`
`1672`	`1672`	`}`
`1673`	`1673`
`1674`		`- if (!op_array->run_time_cache && op_array->last_cache_slot) {`
	`1674`	`+ if (UNEXPECTED(!op_array->run_time_cache)) {`
`1675`	`1675`	`op_array->run_time_cache = zend_arena_calloc(&CG(arena), op_array->last_cache_slot, sizeof(void*));`
`1676`	`1676`	`}`
`1677`	`1677`	`EX_LOAD_RUN_TIME_CACHE(op_array);`
`@@ -1691,12 +1691,12 @@ static zend_always_inline void i_init_code_execute_data(zend_execute_data *execu`
`1691`	`1691`
`1692`	`1692`	`zend_attach_symbol_table(execute_data);`
`1693`	`1693`
`1694`		`- if (op_array->this_var != -1 && Z_OBJ(EX(This))) {`
	`1694`	`+ if (op_array->this_var != -1 && EXPECTED(Z_OBJ(EX(This)))) {`
`1695`	`1695`	`ZVAL_OBJ(EX_VAR(op_array->this_var), Z_OBJ(EX(This)));`
`1696`	`1696`	`GC_REFCOUNT(Z_OBJ(EX(This)))++;`
`1697`	`1697`	`}`
`1698`	`1698`
`1699`		`- if (!op_array->run_time_cache && op_array->last_cache_slot) {`
	`1699`	`+ if (!op_array->run_time_cache) {`
`1700`	`1700`	`op_array->run_time_cache = ecalloc(op_array->last_cache_slot, sizeof(void*));`
`1701`	`1701`	`}`
`1702`	`1702`	`EX_LOAD_RUN_TIME_CACHE(op_array);`
`@@ -1762,12 +1762,12 @@ static zend_always_inline void i_init_execute_data(zend_execute_data *execute_da`
`1762`	`1762`	`}`
`1763`	`1763`	`}`
`1764`	`1764`
`1765`		`- if (op_array->this_var != -1 && Z_OBJ(EX(This))) {`
	`1765`	`+ if (op_array->this_var != -1 && EXPECTED(Z_OBJ(EX(This)))) {`
`1766`	`1766`	`ZVAL_OBJ(EX_VAR(op_array->this_var), Z_OBJ(EX(This)));`
`1767`	`1767`	`GC_REFCOUNT(Z_OBJ(EX(This)))++;`
`1768`	`1768`	`}`
`1769`	`1769`
`1770`		`- if (!op_array->run_time_cache && op_array->last_cache_slot) {`
	`1770`	`+ if (!op_array->run_time_cache) {`
`1771`	`1771`	`if (op_array->function_name) {`
`1772`	`1772`	`op_array->run_time_cache = zend_arena_calloc(&CG(arena), op_array->last_cache_slot, sizeof(void*));`
`1773`	`1773`	`} else {`