Bug 206703 – Fix OpenSource iphoneos arm64e build

• Status: RESOLVED
• Resolution: FIXED
• Component: JavaScriptCore

[Jonathan Bedard]

On arm64e, _STRUCT_ARM_THREAD_STATE64 is opaque. We need to handle this case so WebKit builds with arm64e.

[Jonathan Bedard]

Created attachment 388599 [details]
Patch

[Yusuke Suzuki]

Comment on attachment 388599 [details]
Patch

I think we should not use __opaque_xxx since it is opaque. When introducing PLATFORM_REGISTERS_WITH_PROFILE feature, we defined getter / setter for stack-pointer and instruction-pointer. And instructionPointerImpl and stackPointerImpl are the implementation for these getters and setters. Let's use the macro in getters / setters directly and avoid using stackPointerImpl / instructionPointerImpl for ARM64 / ARM64E Darwin.

[Mark Lam]

Comment on attachment 388599 [details]
Patch

r=me

[Mark Lam]

Comment on attachment 388599 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=388599&action=review

> Source/JavaScriptCore/runtime/MachineContext.h:98
> +    return reinterpret_cast<void*&>(regs.__opaque_sp);

Actually, Yusuke is right.  Can you use the appropriate macros / setter / getters for this instead of accessing __opaque_sp directly?

> Source/JavaScriptCore/runtime/MachineContext.h:404
> +    return reinterpret_cast<void*&>(regs.__opaque_pc);

Ditto.

[Jonathan Bedard]

Created attachment 388711 [details]
Patch

[Jonathan Bedard]

(In reply to Mark Lam from comment #4)
> Comment on attachment 388599 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=388599&action=review
> 
> > Source/JavaScriptCore/runtime/MachineContext.h:98
> > +    return reinterpret_cast<void*&>(regs.__opaque_sp);
> 
> Actually, Yusuke is right.  Can you use the appropriate macros / setter /
> getters for this instead of accessing __opaque_sp directly?
> 
> > Source/JavaScriptCore/runtime/MachineContext.h:404
> > +    return reinterpret_cast<void*&>(regs.__opaque_pc);
> 
> Ditto.

Drafted a change which uses the macros, it's substantially more complicated, though. Still working on testing it everywhere, but wanted it up for discussion.

[Jonathan Bedard]

Created attachment 388713 [details]
Patch

[Yusuke Suzuki]

Comment on attachment 388713 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=388713&action=review

r=me with nit.

> Source/JavaScriptCore/runtime/MachineContext.h:60
> +#if OS(DARWIN) && !USE(PLATFORM_REGISTERS_WITH_PROFILE) && (CPU(ARM_THUMB2) || CPU(ARM) || CPU(ARM64))
> +#define USE_DARWIN_REGISTER_MACROS 1
> +#endif

Let's put this in wtf/PlatformUse.h

[Jonathan Bedard]

Created attachment 388735 [details]
Patch

[Jonathan Bedard]

(In reply to Jonathan Bedard from comment #9)
> Created attachment 388735 [details]
> Patch

I intend to land this on Monday, because while it's tested, it has not been exhaustively tested on every effected configuration.

[WebKit Commit Bot]

The commit-queue encountered the following flaky tests while processing attachment 388735 [details]:

editing/spelling/spellcheck-attribute.html bug 206178 (authors: [e-mail], [e-mail], and [e-mail])
The commit-queue is continuing to process your patch.

[WebKit Commit Bot]

Comment on attachment 388735 [details]
Patch

Clearing flags on attachment: 388735

Committed r255159: <https://trac.webkit.org/changeset/255159>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/58928799>

[Ryan Haddad]

Reverted r255159 for reason:

Broke the watchOS build.

Committed r255169: <https://trac.webkit.org/changeset/255169>

[Jonathan Bedard]

Created attachment 388917 [details]
Patch

[WebKit Commit Bot]

The commit-queue encountered the following flaky tests while processing attachment 388917 [details]:

editing/spelling/spellcheck-attribute.html bug 206178 (authors: [e-mail], [e-mail], and [e-mail])
The commit-queue is continuing to process your patch.

[WebKit Commit Bot]

Comment on attachment 388917 [details]
Patch

Clearing flags on attachment: 388917

Committed r255216: <https://trac.webkit.org/changeset/255216>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.