Title: [181383] releases/WebKitGTK/webkit-2.8/Source
- Revision
- 181383
- Author
- carlo...@webkit.org
- Date
- 2015-03-11 03:49:16 -0700 (Wed, 11 Mar 2015)
Log Message
Merge r181326 - GCC: CRASH() should be annotated with NORETURN
https://bugs.webkit.org/show_bug.cgi?id=142524
Patch by Michael Catanzaro <mcatanz...@igalia.com> on 2015-03-10
Reviewed by Anders Carlsson.
Source/_javascript_Core:
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:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog (181382 => 181383)
--- releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog 2015-03-11 10:23:37 UTC (rev 181382)
+++ releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog 2015-03-11 10:49:16 UTC (rev 181383)
@@ -1,3 +1,15 @@
+2015-03-10 Michael Catanzaro <mcatanz...@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-09 Mark Lam <mark....@apple.com>
8-bit version of weakCompareAndSwap() can cause an infinite loop.
Modified: releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/jsc.cpp (181382 => 181383)
--- releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/jsc.cpp 2015-03-11 10:23:37 UTC (rev 181382)
+++ releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/jsc.cpp 2015-03-11 10:49:16 UTC (rev 181383)
@@ -363,9 +363,6 @@
static NO_RETURN_DUE_TO_CRASH bool deleteProperty(JSCell*, ExecState*, PropertyName)
{
RELEASE_ASSERT_NOT_REACHED();
-#if COMPILER_QUIRK(CONSIDERS_UNREACHABLE_CODE)
- return true;
-#endif
}
unsigned getLength() const { return m_vector.size(); }
Modified: releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog (181382 => 181383)
--- releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog 2015-03-11 10:23:37 UTC (rev 181382)
+++ releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog 2015-03-11 10:49:16 UTC (rev 181383)
@@ -1,3 +1,15 @@
+2015-03-10 Michael Catanzaro <mcatanz...@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-10 Geoffrey Garen <gga...@apple.com>
bmalloc: tryFastMalloc shouldn't crash
Modified: releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Assertions.cpp (181382 => 181383)
--- releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Assertions.cpp 2015-03-11 10:23:37 UTC (rev 181382)
+++ releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Assertions.cpp 2015-03-11 10:49:16 UTC (rev 181383)
@@ -320,7 +320,7 @@
WTFReportBacktrace();
*(int *)(uintptr_t)0xbbadbeef = 0;
// More reliable, but doesn't say BBADBEEF.
-#if COMPILER(CLANG)
+#if COMPILER(CLANG) || COMPILER(GCC)
__builtin_trap();
#else
((void(*)())0)();
@@ -334,7 +334,7 @@
WTFReportBacktrace();
*(int *)(uintptr_t)0xfbadbeef = 0;
// More reliable, but doesn't say fbadbeef.
-#if COMPILER(CLANG)
+#if COMPILER(CLANG) || COMPILER(GCC)
__builtin_trap();
#else
((void(*)())0)();
Modified: releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Assertions.h (181382 => 181383)
--- releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Assertions.h 2015-03-11 10:23:37 UTC (rev 181382)
+++ releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Assertions.h 2015-03-11 10:49:16 UTC (rev 181383)
@@ -112,7 +112,7 @@
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
#define NO_RETURN_DUE_TO_CRASH
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
