Inline FETCH_CONST and DEFINED handlers into "hybrid" executor.

dstogov · dstogov · commit df6056667142 · 2018-07-17T13:30:55.000+03:00
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -5041,7 +5041,7 @@ ZEND_VM_COLD_CONST_HANDLER(110, ZEND_CLONE, CONST|TMPVAR|UNUSED|THIS|CV, ANY)
 	ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 }
 
-ZEND_VM_HANDLER(99, ZEND_FETCH_CONSTANT, UNUSED|CONST_FETCH, CONST, CACHE_SLOT)
+ZEND_VM_HOT_HANDLER(99, ZEND_FETCH_CONSTANT, UNUSED|CONST_FETCH, CONST, CACHE_SLOT)
 {
 	USE_OPLINE
 	zend_constant *c;
@@ -7572,7 +7572,7 @@ ZEND_VM_C_LABEL(type_check_resource):
 	}
 }
 
-ZEND_VM_HANDLER(122, ZEND_DEFINED, CONST, ANY, CACHE_SLOT)
+ZEND_VM_HOT_HANDLER(122, ZEND_DEFINED, CONST, ANY, CACHE_SLOT)
 {
 	USE_OPLINE
 	zend_constant *c;
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -3866,7 +3866,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_TYPE_CHECK_SPEC_C
 	}
 }
 
-static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DEFINED_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
+static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DEFINED_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
 	USE_OPLINE
 	zend_constant *c;
@@ -31960,7 +31960,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U
 	ZEND_VM_NEXT_OPCODE();
 }
 
-static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
+static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
 	USE_OPLINE
 	zend_constant *c;

Original file line number	Diff line number	Diff line change
`@@ -5041,7 +5041,7 @@ ZEND_VM_COLD_CONST_HANDLER(110, ZEND_CLONE, CONST\|TMPVAR\|UNUSED\|THIS\|CV, ANY)`
`5041`	`5041`	`ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();`
`5042`	`5042`	`}`
`5043`	`5043`
`5044`		`-ZEND_VM_HANDLER(99, ZEND_FETCH_CONSTANT, UNUSED\|CONST_FETCH, CONST, CACHE_SLOT)`
	`5044`	`+ZEND_VM_HOT_HANDLER(99, ZEND_FETCH_CONSTANT, UNUSED\|CONST_FETCH, CONST, CACHE_SLOT)`
`5045`	`5045`	`{`
`5046`	`5046`	`USE_OPLINE`
`5047`	`5047`	`zend_constant *c;`
`@@ -7572,7 +7572,7 @@ ZEND_VM_C_LABEL(type_check_resource):`
`7572`	`7572`	`}`
`7573`	`7573`	`}`
`7574`	`7574`
`7575`		`-ZEND_VM_HANDLER(122, ZEND_DEFINED, CONST, ANY, CACHE_SLOT)`
	`7575`	`+ZEND_VM_HOT_HANDLER(122, ZEND_DEFINED, CONST, ANY, CACHE_SLOT)`
`7576`	`7576`	`{`
`7577`	`7577`	`USE_OPLINE`
`7578`	`7578`	`zend_constant *c;`
Original file line number	Diff line number	Diff line change
`@@ -3866,7 +3866,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_TYPE_CHECK_SPEC_C`
`3866`	`3866`	`}`
`3867`	`3867`	`}`
`3868`	`3868`
`3869`		`-static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DEFINED_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)`
	`3869`	`+static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DEFINED_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)`
`3870`	`3870`	`{`
`3871`	`3871`	`USE_OPLINE`
`3872`	`3872`	`zend_constant *c;`
`@@ -31960,7 +31960,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U`
`31960`	`31960`	`ZEND_VM_NEXT_OPCODE();`
`31961`	`31961`	`}`
`31962`	`31962`
`31963`		`-static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)`
	`31963`	`+static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)`
`31964`	`31964`	`{`
`31965`	`31965`	`USE_OPLINE`
`31966`	`31966`	`zend_constant *c;`