Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix file cache run_time_cache unserialization
  Update ZCSG(map_ptr_last) only if for_shm

diff --cc ext/opcache/zend_file_cache.c
Simple merge

diff --cc ext/opcache/zend_persist.c
index e78e3cbfce46b13374bf060bfb42890a50a4b167,dd4c199ef768d50dc8c12006640921b219fab666..cbf91144f3b219c146e181c06acf580b3e088cd3
--- 1/ext/opcache/zend_persist.c
--- 2/ext/opcache/zend_persist.c
+++ b/ext/opcache/zend_persist.c
@@@ -1138,17 -1089,10 +1138,19 @@@ zend_persistent_script *zend_accel_scri
        } ZEND_HASH_FOREACH_END();
        zend_persist_op_array_ex(&script->script.main_op_array, script);
  
-       ZCSG(map_ptr_last) = CG(map_ptr_last);
+       if (for_shm) {
+               ZCSG(map_ptr_last) = CG(map_ptr_last);
+       }
  
 +#ifdef HAVE_JIT
 +      if (ZCG(jit_enabled) && for_shm) {
 +              if (ZEND_JIT_LEVEL(ZCG(accel_directives).jit) >= ZEND_JIT_LEVEL_OPT_SCRIPT) {
 +                      zend_jit_script(&script->script);
 +              }
 +              zend_jit_protect();
 +      }
 +#endif
 +
        script->corrupted = 0;
        ZCG(current_persistent_script) = NULL;