Bug 165308 - WebAssembly: revert patch causing odd breakage
Summary: WebAssembly: revert patch causing odd breakage
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: JavaScriptCore (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: JF Bastien
URL:
Keywords:
Depends on: 164724
Blocks: 161709 165335 165345
  Show dependency treegraph
 
Reported: 2016-12-02 08:58 PST by JF Bastien
Modified: 2016-12-02 15:39 PST (History)
8 users (show)

See Also:


Attachments
patch (181.58 KB, patch)
2016-12-02 09:18 PST, JF Bastien
jfbastien: commit-queue+
Details | Formatted Diff | Diff
patch (181.60 KB, patch)
2016-12-02 09:26 PST, JF Bastien
commit-queue: commit-queue-
Details | Formatted Diff | Diff
patch (181.55 KB, patch)
2016-12-02 09:30 PST, JF Bastien
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description JF Bastien 2016-12-02 08:58:35 PST
Bug #164724 seems to cause build issues which I haven't tracked down yet. WasmOps.h can't be found:
  ./Source/JavaScriptCore/wasm/WasmFormat.h:34:10: fatal error: 'WasmOps.h' file not found

It's weird since the file is auto-generated and has been for a while. #164724 merely includes it in WasmFormat.h.

I have to run out now, so I'll revert #164724 and investigate separately.
Comment 1 JF Bastien 2016-12-02 09:18:12 PST
Created attachment 295951 [details]
patch

I had to merge around Keith's FP op patch. My local build seems to work.

I'll investigate the failure later today, gotta run now.
Comment 2 WebKit Commit Bot 2016-12-02 09:20:38 PST
This patch modifies one of the wasm.json files. Please ensure that any changes in one have been mirrored to the other. You can find the wasm.json files at "Source/JavaScriptCore/wasm/wasm.json" and "JSTests/wasm/wasm.json".
Comment 3 JF Bastien 2016-12-02 09:24:07 PST
Comment on attachment 295951 [details]
patch

cq+ since the public build isn't broken, but some internal one is.
Comment 4 JF Bastien 2016-12-02 09:26:04 PST
Created attachment 295952 [details]
patch

Update "reviewed by".
Comment 5 Mark Lam 2016-12-02 09:27:25 PST
(In reply to comment #4)
> Created attachment 295952 [details]
> patch
> 
> Update "reviewed by".

You don't need a review to roll out a broken patch (suspected or otherwise).
Comment 6 WebKit Commit Bot 2016-12-02 09:28:42 PST
Comment on attachment 295952 [details]
patch

Rejecting attachment 295952 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'validate-changelog', '--check-oops', '--non-interactive', 295952, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

/Volumes/Data/EWS/WebKit/JSTests/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive).

Full output: http://webkit-queues.webkit.org/results/2607884
Comment 7 Mark Lam 2016-12-02 09:29:42 PST
Comment on attachment 295952 [details]
patch

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

> JSTests/ChangeLog:6
> +        Reviewed by NOBODY (fix build break).

Change this to "Not reviewed" and you should be fine.   Or I can review it.
Comment 8 JF Bastien 2016-12-02 09:30:36 PST
Created attachment 295953 [details]
patch

"unreviewed"
Comment 9 Keith Miller 2016-12-02 09:36:19 PST
Comment on attachment 295953 [details]
patch

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

> JSTests/ChangeLog:-70
> -        WebAssembly: update binary format to 0xD version
> -        https://bugs.webkit.org/show_bug.cgi?id=164724
> -
> -        Reviewed by Saam Barati.
> -
> -        As described in the following PR: https://github.com/WebAssembly/design/pull/836
> -
> -        * wasm/Builder.js:
> -        (const._normalizeFunctionSignature):
> -        * wasm/Builder_WebAssemblyBinary.js:
> -        (const.emitters.Type):
> -        (const.emitters.Code):
> -        * wasm/LowLevelBinary.js:
> -        (export.default.LowLevelBinary.prototype.block_type):
> -        (export.default.LowLevelBinary.prototype.inline_signature_type): Deleted.
> -        * wasm/WASM.js:
> -        * wasm/js-api/test_basic_api.js:
> -        * wasm/self-test/test_BuilderWebAssembly.js:
> -        (EmptyModule):
> -        (CustomSection):
> -        * wasm/self-test/test_WASM.js:
> -        * wasm/wasm.json:
> -
> -2016-11-30  JF Bastien  <jfbastien@apple.com>
> -

I wouldn't delete this, we keep the changelog as a historical record of everything that's been committed in the past.
Comment 10 WebKit Commit Bot 2016-12-02 09:55:56 PST
Comment on attachment 295953 [details]
patch

Clearing flags on attachment: 295953

Committed r209242: <http://trac.webkit.org/changeset/209242>
Comment 11 WebKit Commit Bot 2016-12-02 09:56:00 PST
All reviewed patches have been landed.  Closing bug.
Comment 12 JF Bastien 2016-12-02 11:58:07 PST
> I wouldn't delete this, we keep the changelog as a historical record of
> everything that's been committed in the past.


Ugh my bad, I didn't think about that bit and assumed the git hooks would take care of it. I can put it back when I un-revert the revert.