Backport a fix to avoid a GCC 4.8 bug relating to moved exceptions

facebook · Aug 1, 2016 · c1559a0 · c1559a0
1 parent 86c5177
commit c1559a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/hphp/runtime/base/builtin-functions.cpp b/hphp/runtime/base/builtin-functions.cpp
@@ -624,7 +624,7 @@ void throw_object(const Object& e) {
   throw req::root<Object>(e);
 }
 
-#if ((__GNUC__ != 4) || (__GNUC_MINOR__ != 8) || __GNUC_PATCHLEVEL__ >= 2)
+#if ((__GNUC__ != 4) || (__GNUC_MINOR__ != 8))
 void throw_object(Object&& e) {
   throw req::root<Object>(std::move(e));
 }

diff --git a/hphp/runtime/base/builtin-functions.h b/hphp/runtime/base/builtin-functions.h
@@ -148,8 +148,8 @@ Object create_object(const String& s, const Array &params, bool init = true);
 Object init_object(const String& s, const Array &params, ObjectData* o);
 
 [[noreturn]] void throw_object(const Object& e);
-#if ((__GNUC__ != 4) || (__GNUC_MINOR__ != 8) || __GNUC_PATCHLEVEL__ >= 2)
-// gcc-4.8.1 has a bug that causes incorrect code if we
+#if ((__GNUC__ != 4) || (__GNUC_MINOR__ != 8))
+// gcc-4.8 has a bug that causes incorrect code if we
 // define this function.
 [[noreturn]] void throw_object(Object&& e);
 #endif