Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Backport 96a12578c13b5c37195b10526fcdc669b795644d

diff --cc ext/opcache/ZendAccelerator.c
index 1bf2148e547c7bef42d0c18d01150bdf2714dd91,70508b6b05a2cb7538506c10a476407df4c2b322..8ba242723d2071addc48af715ce62b4b11d37c56
--- 1/ext/opcache/ZendAccelerator.c
--- 2/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -751,13 -655,12 +751,12 @@@ static void accel_use_shm_interned_stri
        SHM_UNPROTECT();
        zend_shared_alloc_lock();
  
 -      if (ZCSG(interned_strings_saved_top) == NULL) {
 +      if (ZCSG(interned_strings).saved_top == NULL) {
                accel_copy_permanent_strings(accel_new_interned_string);
        } else {
+               ZCG(counted) = 1;
                accel_copy_permanent_strings(accel_replace_string_by_shm_permanent);
-               if (ZCG(counted)) {
-                       accel_deactivate_sub();
-               }
+               ZCG(counted) = 0;
        }
        accel_interned_strings_save_state();