From 1c2a22180d7f8450010df5f2b2fa40ae6e74cc6f Mon Sep 17 00:00:00 2001 From: bsimmers Date: Wed, 24 Apr 2013 18:40:44 -0700 Subject: [PATCH] Don't check surprise flags in onFunctionExit It's causing unwinding problems. --- hphp/runtime/vm/event_hook.cpp | 3 ++- .../zend/{good => bad}/ext-pcntl/signal_closure_handler.php | 0 .../{good => bad}/ext-pcntl/signal_closure_handler.php.expectf | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename hphp/test/zend/{good => bad}/ext-pcntl/signal_closure_handler.php (100%) rename hphp/test/zend/{good => bad}/ext-pcntl/signal_closure_handler.php.expectf (100%) diff --git a/hphp/runtime/vm/event_hook.cpp b/hphp/runtime/vm/event_hook.cpp index 5035d178c..4f6fd5105 100644 --- a/hphp/runtime/vm/event_hook.cpp +++ b/hphp/runtime/vm/event_hook.cpp @@ -144,7 +144,8 @@ void EventHook::onFunctionExit(const ActRec* ar) { // exception). if (ThreadInfo::s_threadInfo->m_pendingException == nullptr) { RunUserProfiler(ar, ProfileExit); - CheckSurprise(); + // XXX Disabled until t2329497 is fixed: + // CheckSurprise(); } } diff --git a/hphp/test/zend/good/ext-pcntl/signal_closure_handler.php b/hphp/test/zend/bad/ext-pcntl/signal_closure_handler.php similarity index 100% rename from hphp/test/zend/good/ext-pcntl/signal_closure_handler.php rename to hphp/test/zend/bad/ext-pcntl/signal_closure_handler.php diff --git a/hphp/test/zend/good/ext-pcntl/signal_closure_handler.php.expectf b/hphp/test/zend/bad/ext-pcntl/signal_closure_handler.php.expectf similarity index 100% rename from hphp/test/zend/good/ext-pcntl/signal_closure_handler.php.expectf rename to hphp/test/zend/bad/ext-pcntl/signal_closure_handler.php.expectf