Changeset 233504 in webkit

Timestamp:

Jul 4, 2018 5:54:48 AM (6 years ago)

Author:

guijemont@igalia.com

Message:

FunctionTraits: Make cCallArity() constant on 32-bits.
​https://bugs.webkit.org/show_bug.cgi?id=187292

Reviewed by Yusuke Suzuki.

On X86, in Source/JavaScriptCore/jit/CCallHelpers.h we have a
static_assert that uses cCallArity(), so it needs to be constant to
avoid a compilation error. This is achieved by changing an ASSERT into
a static_assert.

• wtf/FunctionTraits.h:

(WTF::slotsForCCallArgument):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/FunctionTraits.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-07-04  Guillaume Emont  <guijemont@igalia.com>
+
+        FunctionTraits: Make cCallArity() constant on 32-bits.
+        https://bugs.webkit.org/show_bug.cgi?id=187292
+
+        Reviewed by Yusuke Suzuki.
+
+        On X86, in Source/JavaScriptCore/jit/CCallHelpers.h we have a
+        static_assert that uses cCallArity(), so it needs to be constant to
+        avoid a compilation error. This is achieved by changing an ASSERT into
+        a static_assert.
+
+
+        * wtf/FunctionTraits.h:
+        (WTF::slotsForCCallArgument):
+
 2018-07-04  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WTF/wtf/FunctionTraits.h

@@ -39 +39 @@
 {
     static_assert(!std::is_class<T>::value || sizeof(T) <= sizeof(void*), "This doesn't support complex structs.");
+    static_assert(sizeof(T) == 8 || sizeof(T) <= 4, "");
     // This assumes that all integral values are passed on the stack.
     if (sizeof(T) == 8)
         return 2;
 
-    ASSERT(sizeof(T) <= 4);
     return 1;
 }