From 53d1db1669d3c7bb3ebb2a53250c49b48b59b576 Mon Sep 17 00:00:00 2001 From: Paul Tarjan Date: Sun, 21 Apr 2013 22:24:25 -0700 Subject: [PATCH] revert over-zealous simplification I was trying to simplify code flow by removing things with tainted variables. I got too carried away and thought tainted wait handles were the same. goodcatch @override-unit-failures --- hphp/runtime/ext/asio/continuation_wait_handle.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hphp/runtime/ext/asio/continuation_wait_handle.cpp b/hphp/runtime/ext/asio/continuation_wait_handle.cpp index 9f6279297..e57ff1f7d 100644 --- a/hphp/runtime/ext/asio/continuation_wait_handle.cpp +++ b/hphp/runtime/ext/asio/continuation_wait_handle.cpp @@ -72,9 +72,10 @@ Object c_ContinuationWaitHandle::ti_start(const char* cls, CObjRef continuation) } if (UNLIKELY(cont->m_index != -1)) { - assert(cont->m_running); Object e(SystemLib::AllocInvalidOperationExceptionObject( - "Encountered an attempt to start currently running continuation")); + cont->m_running + ? "Encountered an attempt to start currently running continuation" + : "Encountered an attempt to start tainted continuation")); throw e; }