Changeset 234344 in webkit

Timestamp:

Jul 28, 2018 9:35:24 AM (6 years ago)

Author:

mark.lam@apple.com

Message:

Gardening: build fix for internal builds.
​https://bugs.webkit.org/show_bug.cgi?id=188123
<rdar://problem/42672268>

Not reviewed.

Some code is relying on RELEASE_ASSERT (without extra crash info arguments)
being purely inlined and not require linkage to an external symbol. This patch
restores this property of the original RELEASE_ASSERT.

This means moving the variant of WTFCrashWithInfo that does not take extra args
to Assertions.h and making it an "inline" function. When compiling with clang,
we also specify attribute((optnone)) to force the function out of being an
inline function (each linkage unit will get a copy of the function). This causes
the 1st 4 arguments of WTFCrashWithInfo (e.g. line number) to still be captured
in the argument registers for crash diagnostics.

• wtf/Assertions.cpp:

(WTFCrashWithInfo):

• wtf/Assertions.h:

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Assertions.cpp (modified) (2 diffs)
• wtf/Assertions.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-07-28  Mark Lam  <mark.lam@apple.com>
+
+        Gardening: build fix for internal builds.
+        https://bugs.webkit.org/show_bug.cgi?id=188123
+        <rdar://problem/42672268>
+
+        Not reviewed.
+
+        Some code is relying on RELEASE_ASSERT (without extra crash info arguments)
+        being purely inlined and not require linkage to an external symbol.  This patch
+        restores this property of the original RELEASE_ASSERT.
+
+        This means moving the variant of WTFCrashWithInfo that does not take extra args
+        to Assertions.h and making it an "inline" function.  When compiling with clang,
+        we also specify __attribute__((optnone)) to force the function out of being an
+        inline function (each linkage unit will get a copy of the function).  This causes
+        the 1st 4 arguments of WTFCrashWithInfo (e.g. line number) to still be captured
+        in the argument registers for crash diagnostics.
+
+        * wtf/Assertions.cpp:
+        (WTFCrashWithInfo):
+        * wtf/Assertions.h:
+
 2018-07-27  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WTF/wtf/Assertions.cpp

@@ -666 +666 @@
 }
 
-void WTFCrashWithInfo(int, const char*, const char*, int)
-{
-    __asm__ volatile (CRASH_INST : : );
-    __builtin_unreachable();
-}
-
 #else
 
@@ -681 +675 @@
 void WTFCrashWithInfo(int, const char*, const char*, int, uint64_t, uint64_t) { CRASH(); }
 void WTFCrashWithInfo(int, const char*, const char*, int, uint64_t) { CRASH(); }
-void WTFCrashWithInfo(int, const char*, const char*, int) { CRASH(); }
 
 #endif // OS(DARWIN) && (CPU(X64_64) || CPU(ARM64))

trunk/Source/WTF/wtf/Assertions.h

@@ -536 +536 @@
 WTF_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH NOT_TAIL_CALLED void WTFCrashWithInfo(int line, const char* file, const char* function, int counter, uint64_t reason, uint64_t misc1);
 WTF_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH NOT_TAIL_CALLED void WTFCrashWithInfo(int line, const char* file, const char* function, int counter, uint64_t reason);
-WTF_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH NOT_TAIL_CALLED void WTFCrashWithInfo(int line, const char* file, const char* function, int counter);
-
+NO_RETURN_DUE_TO_CRASH NOT_TAIL_CALLED void WTFCrashWithInfo(int line, const char* file, const char* function, int counter);
+
+inline void WTFCrashWithInfo(int, const char*, const char*, int)
+#if COMPILER(CLANG)
+    __attribute__((optnone))
+#endif
+{
+    CRASH();
+}
 
 namespace WTF {