-
Notifications
You must be signed in to change notification settings - Fork 7.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Clear recorded errors before executing shutdown functions
Recorded errors may be attached to the wrong cached script when a fatal error occurs during recording. This happens because the fatal error will cause a bailout, which may prevent the recorded errors from being freed. If an other script is compiled after bailout, or if a class is linked after bailout, the recorded errors will be attached to it. This change fixes this by freeing recorded errors before executing shutdown functions. Fixes GH-8063
- Loading branch information
Showing
9 changed files
with
242 additions
and
94 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| --TEST-- | ||
| Bug GH-8063 (Opcache breaks autoloading after E_COMPILE_ERROR) 001 | ||
| --INI-- | ||
| opcache.enable=1 | ||
| opcache.enable_cli=1 | ||
| opcache.record_warnings=0 | ||
| --EXTENSIONS-- | ||
| opcache | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| spl_autoload_register(function ($class) { | ||
| printf("Autoloading %s\n", $class); | ||
| include __DIR__.DIRECTORY_SEPARATOR.'gh8063'.DIRECTORY_SEPARATOR.$class.'.inc'; | ||
| }); | ||
|
|
||
| register_shutdown_function(function () { | ||
| new Bar(); | ||
| new Baz(); | ||
| print "Finished\n"; | ||
| }); | ||
|
|
||
| new BadClass(); | ||
| --EXPECTF-- | ||
| Autoloading BadClass | ||
| Autoloading Foo | ||
|
|
||
| Fatal error: Declaration of BadClass::dummy() must be compatible with Foo::dummy(): void in %sBadClass.inc on line 5 | ||
| Autoloading Bar | ||
| Autoloading Baz | ||
| Finished |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| --TEST-- | ||
| Bug GH-8063 (Opcache breaks autoloading after E_COMPILE_ERROR) 002 | ||
| --INI-- | ||
| opcache.enable=1 | ||
| opcache.enable_cli=1 | ||
| opcache.record_warnings=1 | ||
| --EXTENSIONS-- | ||
| opcache | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| spl_autoload_register(function ($class) { | ||
| printf("Autoloading %s\n", $class); | ||
| include __DIR__.DIRECTORY_SEPARATOR.'gh8063'.DIRECTORY_SEPARATOR.$class.'.inc'; | ||
| }); | ||
|
|
||
| register_shutdown_function(function () { | ||
| new Bar(); | ||
| new Baz(); | ||
| print "Finished\n"; | ||
| }); | ||
|
|
||
| new BadClass(); | ||
| --EXPECTF-- | ||
| Autoloading BadClass | ||
| Autoloading Foo | ||
|
|
||
| Fatal error: Declaration of BadClass::dummy() must be compatible with Foo::dummy(): void in %sBadClass.inc on line 5 | ||
| Autoloading Bar | ||
| Autoloading Baz | ||
| Finished |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| --TEST-- | ||
| Bug GH-8063 (Opcache breaks autoloading after E_COMPILE_ERROR) 003 | ||
| --INI-- | ||
| opcache.enable=1 | ||
| opcache.enable_cli=1 | ||
| opcache.record_warnings=0 | ||
| --EXTENSIONS-- | ||
| opcache | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| spl_autoload_register(function ($class) { | ||
| printf("Autoloading %s\n", $class); | ||
| include __DIR__.DIRECTORY_SEPARATOR.'gh8063'.DIRECTORY_SEPARATOR.$class.'.inc'; | ||
| }); | ||
|
|
||
| register_shutdown_function(function () { | ||
| new Bar(); | ||
| new Baz(); | ||
| print "Finished\n"; | ||
| }); | ||
|
|
||
| new BadClass2(); | ||
| --EXPECTF-- | ||
| Autoloading BadClass2 | ||
|
|
||
| Fatal error: Declaration of BadClass2::dummy() must be compatible with Foo2::dummy(): void in %sBadClass2.inc on line %d | ||
| Autoloading Bar | ||
| Autoloading Baz | ||
| Finished |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?php | ||
|
|
||
| class BadClass extends Foo | ||
| { | ||
| function dummy() | ||
| { | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?php | ||
|
|
||
| class Foo2 | ||
| { | ||
| function dummy(): void | ||
| { | ||
| } | ||
| } | ||
|
|
||
| class BadClass2 extends Foo2 | ||
| { | ||
| function dummy() | ||
| { | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| <?php | ||
|
|
||
| class Bar {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| <?php | ||
|
|
||
| class Baz {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?php | ||
|
|
||
| class Foo | ||
| { | ||
| function dummy(): void | ||
| { | ||
| } | ||
| } |