Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (171481 => 171482)
--- trunk/Source/_javascript_Core/ChangeLog 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-07-23 18:18:34 UTC (rev 171482)
@@ -1,3 +1,17 @@
+2014-07-23 Brent Fulgham <[email protected]>
+
+ [Win] Use NO_RETURN_DUE_TO_CRASH on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=135199
+
+ Reviewed by Mark Lam.
+
+ * jsc.cpp:
+ (WTF::RuntimeArray::deleteProperty): Stop using ugly
+ compiler work-around on Windows; use NO_RETURN_DUE_TO_CRASH
+ codepath instead.
+ * runtime/Identifier.h: Add NO_RETURN_DUE_TO_CRASH
+ to header so function declaration matches implementation.
+
2014-07-23 Bem Jones-Bey <[email protected]>
Remove CSS_EXCLUSIONS compile flag and leftover code
Modified: trunk/Source/_javascript_Core/jsc.cpp (171481 => 171482)
--- trunk/Source/_javascript_Core/jsc.cpp 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/_javascript_Core/jsc.cpp 2014-07-23 18:18:34 UTC (rev 171482)
@@ -356,7 +356,7 @@
static NO_RETURN_DUE_TO_CRASH bool deleteProperty(JSCell*, ExecState*, PropertyName)
{
RELEASE_ASSERT_NOT_REACHED();
-#if !COMPILER(CLANG)
+#if !COMPILER(CLANG) && !COMPILER(MSVC)
return true;
#endif
}
Modified: trunk/Source/_javascript_Core/runtime/Identifier.h (171481 => 171482)
--- trunk/Source/_javascript_Core/runtime/Identifier.h 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/_javascript_Core/runtime/Identifier.h 2014-07-23 18:18:34 UTC (rev 171482)
@@ -113,8 +113,8 @@
static PassRef<StringImpl> add(ExecState*, StringImpl*);
static PassRef<StringImpl> add(VM*, StringImpl*);
- JS_EXPORT_PRIVATE static void checkCurrentAtomicStringTable(ExecState*);
- JS_EXPORT_PRIVATE static void checkCurrentAtomicStringTable(VM*);
+ JS_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH static void checkCurrentAtomicStringTable(ExecState*);
+ JS_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH static void checkCurrentAtomicStringTable(VM*);
};
template <> ALWAYS_INLINE bool Identifier::canUseSingleCharacterString(LChar)
Modified: trunk/Source/WTF/ChangeLog (171481 => 171482)
--- trunk/Source/WTF/ChangeLog 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/WTF/ChangeLog 2014-07-23 18:18:34 UTC (rev 171482)
@@ -1,3 +1,13 @@
+2014-07-23 Brent Fulgham <[email protected]>
+
+ [Win] Use NO_RETURN_DUE_TO_CRASH on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=13519
+
+ Reviewed by Mark Lam.
+
+ * wtf/Assertions.h: Add MSVC to list of compilers supporting this macro.
+ * wtf/FastMalloc.cpp: Correct function declaration for NO_RETURN_DUE_TO_CRASH.
+
2014-07-22 Filip Pizlo <[email protected]>
Merge r169148, r169185, r169188, r169578, r169582, r169584, r169588, r169753 from ftlopt.
Modified: trunk/Source/WTF/wtf/Assertions.h (171481 => 171482)
--- trunk/Source/WTF/wtf/Assertions.h 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/WTF/wtf/Assertions.h 2014-07-23 18:18:34 UTC (rev 171482)
@@ -111,7 +111,7 @@
Signals are ignored by the crash reporter on OS X so we must do better.
*/
-#if COMPILER(CLANG)
+#if COMPILER(CLANG) || COMPILER(MSVC)
#define NO_RETURN_DUE_TO_CRASH NO_RETURN
#else
#define NO_RETURN_DUE_TO_CRASH
@@ -133,7 +133,7 @@
WTF_EXPORT_PRIVATE void WTFLogVerbose(const char* file, int line, const char* function, WTFLogChannel*, const char* format, ...) WTF_ATTRIBUTE_PRINTF(5, 6);
WTF_EXPORT_PRIVATE void WTFLogAlwaysV(const char* format, va_list);
WTF_EXPORT_PRIVATE void WTFLogAlways(const char* format, ...) WTF_ATTRIBUTE_PRINTF(1, 2);
-WTF_EXPORT_PRIVATE void WTFLogAlwaysAndCrash(const char* format, ...) WTF_ATTRIBUTE_PRINTF(1, 2) NO_RETURN_DUE_TO_CRASH;
+WTF_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH void WTFLogAlwaysAndCrash(const char* format, ...) WTF_ATTRIBUTE_PRINTF(1, 2);
WTF_EXPORT_PRIVATE WTFLogChannel* WTFLogChannelByName(WTFLogChannel*[], size_t count, const char*);
WTF_EXPORT_PRIVATE void WTFInitializeLogChannelStatesFromString(WTFLogChannel*[], size_t count, const char*);
@@ -156,7 +156,7 @@
#ifdef __cplusplus
extern "C" {
#endif
-WTF_EXPORT_PRIVATE void WTFCrash() NO_RETURN_DUE_TO_CRASH;
+ WTF_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH void WTFCrash();
#ifdef __cplusplus
}
#endif
@@ -168,7 +168,7 @@
#ifdef __cplusplus
extern "C" {
#endif
- WTF_EXPORT_PRIVATE void WTFCrashWithSecurityImplication() NO_RETURN_DUE_TO_CRASH;
+ WTF_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH void WTFCrashWithSecurityImplication();
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (171481 => 171482)
--- trunk/Source/WTF/wtf/FastMalloc.cpp 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2014-07-23 18:18:34 UTC (rev 171482)
@@ -189,7 +189,7 @@
namespace Internal {
#if !ENABLE(WTF_MALLOC_VALIDATION)
-WTF_EXPORT_PRIVATE void fastMallocMatchFailed(void*);
+WTF_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH void fastMallocMatchFailed(void*);
#else
COMPILE_ASSERT(((sizeof(ValidationHeader) % sizeof(AllocAlignmentInteger)) == 0), ValidationHeader_must_produce_correct_alignment);
#endif
Modified: trunk/Source/WebCore/ChangeLog (171481 => 171482)
--- trunk/Source/WebCore/ChangeLog 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/WebCore/ChangeLog 2014-07-23 18:18:34 UTC (rev 171482)
@@ -1,3 +1,13 @@
+2014-07-23 Brent Fulgham <[email protected]>
+
+ [Win] Use NO_RETURN_DUE_TO_CRASH on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=13519
+
+ Reviewed by Mark Lam.
+
+ * svg/SVGZoomAndPan.h: Add NO_RETURN_DUE_TO_CRASH to
+ header so function declarations match implementation.
+
2014-07-23 Joseph Pecoraro <[email protected]>
JSDOMWindowShell leaks on pages with media elements
Modified: trunk/Source/WebCore/svg/SVGZoomAndPan.h (171481 => 171482)
--- trunk/Source/WebCore/svg/SVGZoomAndPan.h 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/WebCore/svg/SVGZoomAndPan.h 2014-07-23 18:18:34 UTC (rev 171482)
@@ -76,9 +76,9 @@
// These methods only exist to allow us to compile JSSVGZoomAndPan.*.
// These are never called, and thus ASSERT_NOT_REACHED.
- void ref();
- void deref();
- void setZoomAndPan(unsigned short);
+ NO_RETURN_DUE_TO_ASSERT void ref();
+ NO_RETURN_DUE_TO_ASSERT void deref();
+ NO_RETURN_DUE_TO_ASSERT void setZoomAndPan(unsigned short);
};
} // namespace WebCore
