From 09712029dd69f40de479930b20e6c922b4f34208 Mon Sep 17 00:00:00 2001
From: Bill Fumerola <bill@fb.com>
Date: Thu, 4 Jun 2015 10:12:11 -0700
Subject: [PATCH] remove unused WaitHandle->getExceptionIfFailed()

Reviewed By: @jano

Differential Revision: D2127355
---
 hphp/hack/hhi/classes.hhi                 |  1 -
 hphp/runtime/ext/asio/ext_wait-handle.cpp |  4 ----
 hphp/runtime/ext/asio/ext_wait-handle.h   |  1 -
 hphp/system/idl/asio.idl.json             | 13 -------------
 hphp/test/slow/async/exceptions.php       |  4 +++-
 5 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/hphp/hack/hhi/classes.hhi b/hphp/hack/hhi/classes.hhi
index ad07dbecad7..12190a19f82 100644
--- a/hphp/hack/hhi/classes.hhi
+++ b/hphp/hack/hhi/classes.hhi
@@ -43,7 +43,6 @@ abstract class WaitHandle<+T> implements Awaitable<T> {
   public function getID(): int {}
   public function getName(): string {}
   public function result() : T {}
-  public function getExceptionIfFailed(): ?Exception {}
   public static function setOnIOWaitEnterCallback(?(function(): void) $callback) {}
   public static function setOnIOWaitExitCallback(?(function(): void) $callback) {}
   public static function setOnJoinCallback(?(function(WaitableWaitHandle<mixed>): void) $callback) {}
diff --git a/hphp/runtime/ext/asio/ext_wait-handle.cpp b/hphp/runtime/ext/asio/ext_wait-handle.cpp
index df7814bd52a..44b13511731 100644
--- a/hphp/runtime/ext/asio/ext_wait-handle.cpp
+++ b/hphp/runtime/ext/asio/ext_wait-handle.cpp
@@ -108,9 +108,5 @@ String c_WaitHandle::t_getname() {
   return static_cast<c_WaitableWaitHandle*>(this)->getName();
 }
 
-Object c_WaitHandle::t_getexceptioniffailed() {
-  return isFailed() ? getException() : nullptr;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 }
diff --git a/hphp/runtime/ext/asio/ext_wait-handle.h b/hphp/runtime/ext/asio/ext_wait-handle.h
index 989eb15305a..88227ffcda3 100644
--- a/hphp/runtime/ext/asio/ext_wait-handle.h
+++ b/hphp/runtime/ext/asio/ext_wait-handle.h
@@ -101,7 +101,6 @@ class c_WaitHandle : public ExtObjectDataFlags<ObjectData::IsWaitHandle|
   bool t_isfailed();
   int64_t t_getid();
   String t_getname();
-  Object t_getexceptioniffailed();
 
  public:
   static constexpr ptrdiff_t stateOff() {
diff --git a/hphp/system/idl/asio.idl.json b/hphp/system/idl/asio.idl.json
index ae7cd2e3d78..35e04bbea7e 100644
--- a/hphp/system/idl/asio.idl.json
+++ b/hphp/system/idl/asio.idl.json
@@ -200,19 +200,6 @@
                     },
                     "args": [
                     ]
-                },
-                {
-                    "name": "getExceptionIfFailed",
-                    "desc": "Get exception if this wait handle has failed, or null",
-                    "flags": [
-                        "IsFinal"
-                    ],
-                    "return": {
-                        "type": "Object",
-                        "desc": "An exception if this wait handle has failed, or null"
-                    },
-                    "args": [
-                    ]
                 }
             ],
             "consts": [
diff --git a/hphp/test/slow/async/exceptions.php b/hphp/test/slow/async/exceptions.php
index 3b51731c267..5385a1dccc2 100644
--- a/hphp/test/slow/async/exceptions.php
+++ b/hphp/test/slow/async/exceptions.php
@@ -11,7 +11,9 @@ async function bThrow() { await block(); throw new Exception(__function__); }
 async function bbThrow() { await block(); await bThrow(); }
 
 function verify(&$a, &$e) {
-  assert($a->getExceptionIfFailed()->getMessage() == $e->getMessage());
+  try { $a->result(); }
+  catch (Exception $ae) {}
+  assert($ae->getMessage() == $e->getMessage());
   var_dump($e->getMessage());
 }
 
-- 
2.11.4.GIT