Use SmartPtr in exception classes.

Summary: Use SmartPtr to hold the ArrayData in the exception classes to remove the explicit ref counting. I had to declare throw_null_pointer_exception and throw_invalid_object_type in smart-ptr.h to break a circular dependency in the includes. Reviewed By: @edwinsmith Differential Revision: D1832715
facebook · Feb 14, 2015 · 01ef964 · 01ef964
1 parent 618c3ce
commit 01ef964
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 deletions.
diff --git a/hphp/runtime/base/exceptions.cpp b/hphp/runtime/base/exceptions.cpp
@@ -101,13 +101,5 @@ void throw_not_supported(const char* feature, const char* reason) {
   throw ExtendedException("%s is not supported: %s", feature, reason);
 }
 
-void intrusive_ptr_add_ref(ArrayData* a) {
-  a->incRefCount();
-}
-
-void intrusive_ptr_release(ArrayData* a) {
-  decRefArr(a);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 }
diff --git a/hphp/runtime/base/exceptions.h b/hphp/runtime/base/exceptions.h
@@ -17,7 +17,6 @@
 #ifndef incl_HPHP_CPP_BASE_EXCEPTIONS_H_
 #define incl_HPHP_CPP_BASE_EXCEPTIONS_H_
 
-#include <boost/intrusive_ptr.hpp>
 #include <string>
 #include <atomic>
 #include <utility>
@@ -26,22 +25,16 @@
 
 #include "hphp/util/portability.h"
 #include "hphp/util/exception.h"
+#include "hphp/runtime/base/type-array.h"
 
 namespace HPHP {
 
 //////////////////////////////////////////////////////////////////////
 
-struct Array;
-struct ArrayData;
 struct String;
 
 //////////////////////////////////////////////////////////////////////
 
-void intrusive_ptr_add_ref(ArrayData* a);
-void intrusive_ptr_release(ArrayData* a);
-
-//////////////////////////////////////////////////////////////////////
-
 /*
  * ExtendedException is the exception type for C++ exceptions that carry PHP
  * stack traces, but do not represent user-visible PHP exception objects.
@@ -81,7 +74,7 @@ struct ExtendedException : Exception {
   void computeBacktrace(bool skipFrame = false);
 
 private:
-  boost::intrusive_ptr<ArrayData> m_btp;
+  Array m_btp;
   bool m_silent{false};
 };
 

diff --git a/hphp/runtime/base/smart-ptr.h b/hphp/runtime/base/smart-ptr.h
@@ -18,8 +18,8 @@
 #define incl_HPHP_SMART_PTR_H_
 
 #include "hphp/runtime/base/types.h"
-#include "hphp/runtime/base/exceptions.h"
 #include "hphp/runtime/base/countable.h"
+#include "hphp/util/portability.h"
 #include "hphp/util/compilation-flags.h"
 #include <algorithm>
 
@@ -372,6 +372,8 @@ typename std::enable_if<
 
 const char* getClassNameCstr(const ResourceData* p);
 const char* getClassNameCstr(const ObjectData* p);
+extern void throw_null_pointer_exception() ATTRIBUTE_NORETURN;
+extern void throw_invalid_object_type(const char* clsName) ATTRIBUTE_NORETURN;
 
 // Is pointer contained in p castable to a T?
 template <typename T, typename P>

diff --git a/hphp/runtime/base/type-resource.h b/hphp/runtime/base/type-resource.h
@@ -17,6 +17,7 @@
 #ifndef incl_HPHP_RESOURCE_H_
 #define incl_HPHP_RESOURCE_H_
 
+#include "hphp/runtime/base/exceptions.h"
 #include "hphp/runtime/base/resource-data.h"
 #include "hphp/runtime/base/smart-ptr.h"
 #include "hphp/runtime/base/sweepable.h"