From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 18 Feb 2019 10:48:06 +0000 (+0300)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=820a9952cb86d7d12ca5bb836c36efb2060447c3;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed use-after-free during preloading, when q class with unresolved constant uses a preloaded trait.
---

820a9952cb86d7d12ca5bb836c36efb2060447c3