From 8c9f639a1df068976a841e9b5624d2f5d5d9c7c7 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Tue, 11 Oct 2016 11:24:08 +0200
Subject: Revert "Fixed bug #73067 (__debugInfo crashes when throwing an
 exception)"

This reverts commit 2d8ab51576695630a7471ff829cc5ea10becdc0f.
---
 Zend/tests/bug73067.phpt    | 21 ---------------------
 Zend/zend_object_handlers.c |  1 -
 2 files changed, 22 deletions(-)
 delete mode 100644 Zend/tests/bug73067.phpt

diff --git a/Zend/tests/bug73067.phpt b/Zend/tests/bug73067.phpt
deleted file mode 100644
index f5d34a8d87..0000000000
--- a/Zend/tests/bug73067.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-Bug #73067 (__debugInfo crashes when throwing an exception)
---FILE--
-<?php
-
-class Debug
-{
-	public function __debugInfo()
-	{
-		throw new Exception("Test Crash");
-	}
-}
-
-try {
-	var_dump(new Debug());
-} catch (Exception $e) {
-	echo $e->getMessage();
-}
-?>
---EXPECTF--
-Fatal error: __debuginfo() must return an array in %sbug73067.php on line %d
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 39c4d3d7e8..70dab660b3 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -182,7 +182,6 @@ ZEND_API HashTable *zend_std_get_debug_info(zval *object, int *is_temp) /* {{{ *
 		return ht;
 	}
 
-	zend_clear_exception();
 	zend_error_noreturn(E_ERROR, ZEND_DEBUGINFO_FUNC_NAME "() must return an array");
 
 	return NULL; /* Compilers are dumb and don't understand that noreturn means that the function does NOT need a return value... */
-- 
cgit v1.2.1