Attachment 370004 Details for Bug 197932 – Patch

[patch] Patch

bug-197932-20190515155850.patch (text/plain), 2.00 KB, created by Ross Kirsling on 2019-05-15 15:58:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2019-05-15 15:58:52 PDT

Size: 2.00 KB

patch

obsolete

>Subversion Revision: 245344
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 9b33d2f5d9fcdf2fa058b11d8948f68cdfab1cf1..ea27f95f5ed0ef4011805c9ca806ac8ba79a479f 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-15  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        [PlayStation] WTFCrash should preserve register state.
>+        https://bugs.webkit.org/show_bug.cgi?id=197932
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/Assertions.cpp:
>+        * wtf/Assertions.h:
>+        Let r196397 apply to PlayStation port as well.
>+
> 2019-05-15  Simon Fraser  <simon.fraser@apple.com>
> 
>         Make LOG_WITH_STREAM more efficient
>diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp
>index fb7a36bd1c3c2307d06db9b98891ac14e9a66c3a..ffd050a7ca8553018b28ff7d800fe8922a7fd50e 100644
>--- a/Source/WTF/wtf/Assertions.cpp
>+++ b/Source/WTF/wtf/Assertions.cpp
>@@ -295,7 +295,7 @@ void WTFPrintBacktrace(void** stack, int size)
>     out.print(stackTrace);
> }
> 
>-#if !defined(NDEBUG) || !OS(DARWIN)
>+#if !defined(NDEBUG) || !(OS(DARWIN) || PLATFORM(PLAYSTATION))
> void WTFCrash()
> {
>     WTFReportBacktrace();
>@@ -319,7 +319,7 @@ void WTFCrash()
> {
>     CRASH();
> }
>-#endif // !defined(NDEBUG) || !OS(DARWIN)
>+#endif // !defined(NDEBUG) || !(OS(DARWIN) || PLATFORM(PLAYSTATION))
> 
> void WTFCrashWithSecurityImplication()
> {
>diff --git a/Source/WTF/wtf/Assertions.h b/Source/WTF/wtf/Assertions.h
>index dd64976328400efbf5d89bbb29aba5c73c4b9ed5..7062e7cecaa5b13a7ce6d96af6fa01a55cecaebe 100644
>--- a/Source/WTF/wtf/Assertions.h
>+++ b/Source/WTF/wtf/Assertions.h
>@@ -235,7 +235,7 @@ WTF_EXPORT_PRIVATE bool WTFIsDebuggerAttached(void);
> 
> #ifndef CRASH
> 
>-#if defined(NDEBUG) && OS(DARWIN)
>+#if defined(NDEBUG) && (OS(DARWIN) || PLATFORM(PLAYSTATION))
> // Crash with a SIGTRAP i.e EXC_BREAKPOINT.
> // We are not using __builtin_trap because it is only guaranteed to abort, but not necessarily
> // trigger a SIGTRAP. Instead, we use inline asm to ensure that we trigger the SIGTRAP.

Actions: View | Formatted Diff | Diff

Attachments on bug 197932: 370004