Changeset 181326 in webkit

Timestamp:

Mar 10, 2015 9:01:51 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

GCC: CRASH() should be annotated with NORETURN
​https://bugs.webkit.org/show_bug.cgi?id=142524

Patch by Michael Catanzaro <Michael Catanzaro> on 2015-03-10
Reviewed by Anders Carlsson.

Source/JavaScriptCore:

Don't return from a NORETURN function. This used to avoid a warning from GCC, but now it
causes one.

• jsc.cpp:

Source/WTF:

Add COMPILER(GCC) to #ifdefs that already exist for Clang.

• wtf/Assertions.cpp:
• wtf/Assertions.h:

Location:

trunk/Source

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-03-10  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        GCC: CRASH() should be annotated with NORETURN
+        https://bugs.webkit.org/show_bug.cgi?id=142524
+
+        Reviewed by Anders Carlsson.
+
+        Don't return from a NORETURN function. This used to avoid a warning from GCC, but now it
+        causes one.
+
+        * jsc.cpp:
+
 2015-03-10  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -364 +364 @@
     {
         RELEASE_ASSERT_NOT_REACHED();
-#if COMPILER_QUIRK(CONSIDERS_UNREACHABLE_CODE)
-        return true;
-#endif
     }
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2015-03-10  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        GCC: CRASH() should be annotated with NORETURN
+        https://bugs.webkit.org/show_bug.cgi?id=142524
+
+        Reviewed by Anders Carlsson.
+
+        Add COMPILER(GCC) to #ifdefs that already exist for Clang.
+
+        * wtf/Assertions.cpp:
+        * wtf/Assertions.h:
+
 2015-03-09  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WTF/wtf/Assertions.cpp

@@ -321 +321 @@
     *(int *)(uintptr_t)0xbbadbeef = 0;
     // More reliable, but doesn't say BBADBEEF.
-#if COMPILER(CLANG)
+#if COMPILER(CLANG) || COMPILER(GCC)
     __builtin_trap();
 #else
@@ -335 +335 @@
     *(int *)(uintptr_t)0xfbadbeef = 0;
     // More reliable, but doesn't say fbadbeef.
-#if COMPILER(CLANG)
+#if COMPILER(CLANG) || COMPILER(GCC)
     __builtin_trap();
 #else

trunk/Source/WTF/wtf/Assertions.h

@@ -113 +113 @@
    Signals are ignored by the crash reporter on OS X so we must do better.
 */
-#if COMPILER(CLANG) || COMPILER(MSVC)
+#if COMPILER(CLANG) || COMPILER(GCC) || COMPILER(MSVC)
 #define NO_RETURN_DUE_TO_CRASH NO_RETURN
 #else