Changeset 177753 in webkit

Timestamp:

Dec 26, 2014, 5:17:01 PM (10 years ago)

Author:

mitz@apple.com

Message:

Build fix.

Removed use of builtin_s{add,sub}_overflow introduced in r177729 that was causing a compiler used at Apple to crash because of <rdar://problem/19347133>.

• wtf/SaturatedArithmetic.h:

(signedAddOverflows):
(signedSubtractOverflows):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/SaturatedArithmetic.h (modified) (4 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2014-12-26  Dan Bernstein  <mitz@apple.com>
+
+        Build fix.
+
+        Removed use of __builtin_s{add,sub}_overflow introduced in r177729 that was causing a compiler used at Apple to crash because of <rdar://problem/19347133>.
+
+        * wtf/SaturatedArithmetic.h:
+        (signedAddOverflows):
+        (signedSubtractOverflows):
+
 2014-12-26  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WTF/wtf/SaturatedArithmetic.h

@@ -40 +40 @@
 inline bool signedAddOverflows(int32_t a, int32_t b, int32_t& result)
 {
-#if COMPILER_HAS_CLANG_BUILTIN(__builtin_sadd_overflow)
-    return __builtin_sadd_overflow(a, b, &result);
-#else
     uint32_t ua = a;
     uint32_t ub = b;
@@ -51 +48 @@
     // bit of the result and one of the values differ it did overflow.
     return !((ua ^ ub) >> 31) & (uresult ^ ua) >> 31;
-#endif
 }
 
@@ -72 +68 @@
 inline bool signedSubtractOverflows(int32_t a, int32_t b, int32_t& result)
 {
-#if COMPILER_HAS_CLANG_BUILTIN(__builtin_ssub_overflow)
-    return __builtin_ssub_overflow(a, b, &result);
-#else
     uint32_t ua = a;
     uint32_t ub = b;
@@ -83 +76 @@
     // signed bit of the result and the first value differ it did overflow.
     return (ua ^ ub) >> 31 & (uresult ^ ua) >> 31;
-#endif
 }