Skip to content

Commit c1559a0

Browse files
committed
Backport a fix to avoid a GCC 4.8 bug relating to moved exceptions
1 parent 86c5177 commit c1559a0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

hphp/runtime/base/builtin-functions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ void throw_object(const Object& e) {
624624
throw req::root<Object>(e);
625625
}
626626

627-
#if ((__GNUC__ != 4) || (__GNUC_MINOR__ != 8) || __GNUC_PATCHLEVEL__ >= 2)
627+
#if ((__GNUC__ != 4) || (__GNUC_MINOR__ != 8))
628628
void throw_object(Object&& e) {
629629
throw req::root<Object>(std::move(e));
630630
}

hphp/runtime/base/builtin-functions.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ Object create_object(const String& s, const Array &params, bool init = true);
148148
Object init_object(const String& s, const Array &params, ObjectData* o);
149149

150150
[[noreturn]] void throw_object(const Object& e);
151-
#if ((__GNUC__ != 4) || (__GNUC_MINOR__ != 8) || __GNUC_PATCHLEVEL__ >= 2)
152-
// gcc-4.8.1 has a bug that causes incorrect code if we
151+
#if ((__GNUC__ != 4) || (__GNUC_MINOR__ != 8))
152+
// gcc-4.8 has a bug that causes incorrect code if we
153153
// define this function.
154154
[[noreturn]] void throw_object(Object&& e);
155155
#endif

0 commit comments

Comments
 (0)