Attachment 343292 Details for Bug 185947 – proposed patch.

[patch] proposed patch.

bug-185947.patch (text/plain), 1.53 KB, created by Mark Lam on 2018-06-21 17:08:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Lam

Created: 2018-06-21 17:08:58 PDT

Size: 1.53 KB

patch

obsolete

>Index: Source/JavaScriptCore/ChangeLog
>===================================================================
>--- Source/JavaScriptCore/ChangeLog	(revision 233068)
>+++ Source/JavaScriptCore/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2018-06-21  Mark Lam  <mark.lam@apple.com>
>+
>+        WebKit (JavaScriptCore) compilation error with Clang â¥ 6.
>+        https://bugs.webkit.org/show_bug.cgi?id=185947
>+        <rdar://problem/40131933>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Newer Clang versions (due to C++17 support) is not happy with how I implemented
>+        conversions between CodeLocation types.  We'll fix this by adding a conversion
>+        operator for converting between CodeLocation types.
>+
>+        * assembler/CodeLocation.h:
>+        (JSC::CodeLocationCommon::operator T):
>+
> 2018-06-21  Saam Barati  <sbarati@apple.com>
> 
>         Do some CoW cleanup
>Index: Source/JavaScriptCore/assembler/CodeLocation.h
>===================================================================
>--- Source/JavaScriptCore/assembler/CodeLocation.h	(revision 233041)
>+++ Source/JavaScriptCore/assembler/CodeLocation.h	(working copy)
>@@ -71,6 +71,12 @@ public:
>     template<typename T = void*>
>     T dataLocation() const { return Base::template dataLocation<T>(); }
> 
>+    template<typename T, typename = std::enable_if_t<std::is_base_of<CodeLocationCommon<tag>, T>::value>>
>+    operator T()
>+    {
>+        return T(MacroAssemblerCodePtr<tag>::createFromExecutableAddress(this->executableAddress()));
>+    }
>+
> protected:
>     CodeLocationCommon()
>     {

Actions: View | Formatted Diff | Diff

Attachments on bug 185947: 343292