Merge branch 'PHP-8.0' into PHP-8.1

dstogov · dstogov · commit 3e076ddf0640 · 2022-10-17T11:24:00.000+03:00
* PHP-8.0:
  Discard disasm symbols on opcache restart
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
@@ -5203,6 +5203,13 @@ ZEND_EXT_API void zend_jit_restart(void)
 		}
 
 		zend_jit_protect();
+
+#ifdef HAVE_DISASM
+		if (JIT_G(debug) & (ZEND_JIT_DEBUG_ASM|ZEND_JIT_DEBUG_ASM_STUBS)) {
+			zend_jit_disasm_shutdown();
+			zend_jit_disasm_init();
+		}
+#endif
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5203,6 +5203,13 @@ ZEND_EXT_API void zend_jit_restart(void)`
`5203`	`5203`	`}`
`5204`	`5204`
`5205`	`5205`	`zend_jit_protect();`
	`5206`	`+`
	`5207`	`+#ifdef HAVE_DISASM`
	`5208`	`+ if (JIT_G(debug) & (ZEND_JIT_DEBUG_ASM\|ZEND_JIT_DEBUG_ASM_STUBS)) {`
	`5209`	`+ zend_jit_disasm_shutdown();`
	`5210`	`+ zend_jit_disasm_init();`
	`5211`	`+ }`
	`5212`	`+#endif`
`5206`	`5213`	`}`
`5207`	`5214`	`}`
`5208`	`5215`