Bug 129785 - Use the LLVM disassembler on ARM64 if we are enabling the FTL
Summary: Use the LLVM disassembler on ARM64 if we are enabling the FTL
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: JavaScriptCore (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P2 Normal
Assignee: Filip Pizlo
URL:
Keywords:
Depends on:
Blocks: 112840
  Show dependency tree / graph
 
Reported: 2014-03-05 23:50 PST by Filip Pizlo
Modified: 2014-03-06 07:49 PST (History)
13 users (show)

See Also:

Attachments
the patch (2.84 KB, patch)
2014-03-05 23:52 PST, Filip Pizlo 		no flags Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Filip Pizlo 2014-03-05 23:50:16 PST 
Patch forthcoming.
Comment 1 Filip Pizlo 2014-03-05 23:52:14 PST 
Created attachment 225959 [details]
the patch
Comment 2 Geoffrey Garen 2014-03-06 00:40:16 PST 
Comment on attachment 225959 [details]
the patch

r=me
Comment 3 WebKit Commit Bot 2014-03-06 01:11:35 PST 
Comment on attachment 225959 [details]
the patch

Clearing flags on attachment: 225959

Committed r165180: <http://trac.webkit.org/changeset/165180>
Comment 4 WebKit Commit Bot 2014-03-06 01:11:38 PST 
All reviewed patches have been landed.  Closing bug.
Comment 5 Joseph Pecoraro 2014-03-06 02:08:43 PST 
Building on my Mac I'm seeing a duplicate symbol Ld error:

duplicate symbol __ZN3JSC16tryToDisassembleERKNS_21MacroAssemblerCodePtrEmPKcRN3WTF11PrintStreamENS_21InstructionSubsetHintE in:
    /Volumes/Data/Build/JavaScriptCore.build/Debug/JavaScriptCore.build/Objects-normal/x86_64/ARM64Disassembler.o
    /Volumes/Data/Build/JavaScriptCore.build/Debug/JavaScriptCore.build/Objects-normal/x86_64/X86Disassembler.o

I'll try a clean build.
Comment 6 Joseph Pecoraro 2014-03-06 02:34:32 PST 
Comment on attachment 225959 [details]
the patch

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

> Source/JavaScriptCore/disassembler/ARM64Disassembler.cpp:58
>  #endif // USE(ARM64_DISASSEMBLER)
>  
> +#if USE(LLVM_DISASSEMBLER)

I'm guessing this new code should probably have gone inside of the ARM64_DISASSEMBLER #ifdef. Moving it inside gets me past my duplicate symbol issue. A clean build did not help.
Comment 7 Filip Pizlo 2014-03-06 07:40:37 PST 
Land patch, pass out!

I'm fixing it.
Comment 8 Filip Pizlo 2014-03-06 07:49:40 PST 
Fixed in r165191