Summary: | Define *_GIGACAGE_MASK when Gigacage is not supported | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Don Olmstead <don.olmstead> | ||||||
Component: | JavaScriptCore | Assignee: | Don Olmstead <don.olmstead> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | benjamin, buildbot, cdumez, cmarcelo, commit-queue, dbates, fpizlo, mark.lam, webkit-bug-importer | ||||||
Priority: | P2 | Keywords: | InRadar | ||||||
Version: | WebKit Nightly Build | ||||||||
Hardware: | Unspecified | ||||||||
OS: | Unspecified | ||||||||
Attachments: |
|
Description
Don Olmstead
2017-08-25 13:37:45 PDT
Created attachment 319095 [details]
Patch
Fix suggested by mlam on IRC. Built WinCairo successfully.
Comment on attachment 319095 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=319095&action=review > Source/WTF/wtf/Gigacage.h:33 > +#define PRIMITIVE_GIGACAGE_MASK UINTPTR_MAX > +#define JSVALUE_GIGACAGE_MASK UINTPTR_MAX Why? Comment on attachment 319095 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=319095&action=review >> Source/WTF/wtf/Gigacage.h:33 >> +#define JSVALUE_GIGACAGE_MASK UINTPTR_MAX > > Why? The wincairo build which does not use bmalloc is failing to build. Is this the wrong fix for when bmalloc is not used? (In reply to Mark Lam from comment #3) > Comment on attachment 319095 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=319095&action=review > > >> Source/WTF/wtf/Gigacage.h:33 > >> +#define JSVALUE_GIGACAGE_MASK UINTPTR_MAX > > > > Why? > > The wincairo build which does not use bmalloc is failing to build. Is this > the wrong fix for when bmalloc is not used? I see. OK. Comment on attachment 319095 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=319095&action=review >>>> Source/WTF/wtf/Gigacage.h:33 >>>> +#define JSVALUE_GIGACAGE_MASK UINTPTR_MAX >>> >>> Why? >> >> The wincairo build which does not use bmalloc is failing to build. Is this the wrong fix for when bmalloc is not used? > > I see. OK. Please set these to 0, not UINTPTR_MAX. Comment on attachment 319095 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=319095&action=review >>>>> Source/WTF/wtf/Gigacage.h:33 >>>>> +#define JSVALUE_GIGACAGE_MASK UINTPTR_MAX >>>> >>>> Why? >>> >>> The wincairo build which does not use bmalloc is failing to build. Is this the wrong fix for when bmalloc is not used? >> >> I see. OK. > > Please set these to 0, not UINTPTR_MAX. At first, I thought that the llint code is unconditionally applying the masm. But I see that the llint code only applies the mask if GIGACAGE_ENABLED. Hence, setting these to 0 makes sense. Created attachment 319096 [details]
Patch
Setting masks to 0
Comment on attachment 319096 [details]
Patch
r=me if EWS is green and if this patch makes the code build on wincairo (which was where this issue was detected) and tests passes there as well.
Comment on attachment 319096 [details] Patch Clearing flags on attachment: 319096 Committed r221211: <http://trac.webkit.org/changeset/221211> All reviewed patches have been landed. Closing bug. |