Merge branch 'PHP-8.1' into PHP-8.2

dstogov · dstogov · commit 5e10aa4e5fed · 2022-10-17T11:24:08.000+03:00
* PHP-8.1:
  Discard disasm symbols on opcache restart
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
@@ -5186,6 +5186,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
`@@ -5186,6 +5186,13 @@ ZEND_EXT_API void zend_jit_restart(void)`
`5186`	`5186`	`}`
`5187`	`5187`
`5188`	`5188`	`zend_jit_protect();`
	`5189`	`+`
	`5190`	`+#ifdef HAVE_DISASM`
	`5191`	`+ if (JIT_G(debug) & (ZEND_JIT_DEBUG_ASM\|ZEND_JIT_DEBUG_ASM_STUBS)) {`
	`5192`	`+ zend_jit_disasm_shutdown();`
	`5193`	`+ zend_jit_disasm_init();`
	`5194`	`+ }`
	`5195`	`+#endif`
`5189`	`5196`	`}`
`5190`	`5197`	`}`
`5191`	`5198`