- 14 Jun, 2018 15 commits
-
-
Sigurd Schneider authored
Bug: v8:7783 Change-Id: I878e8dd8bcfb7b797515b44bbe4333a7d85e8cc4 Reviewed-on: https://chromium-review.googlesource.com/1101024Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Commit-Queue: Sigurd Schneider <sigurds@chromium.org> Cr-Commit-Position: refs/heads/master@{#53738}
-
jgruber authored
The stack check instruction sequence is pattern-matched in instruction-selector-{ia32,x64}.cc and replaced with its own specialized opcode, for which we later generate an efficient stack check in a single instruction. But this pattern matching has never worked for CSA-generated code. The matcher expected LoadStackPointer in the right operand and the external reference load in the left operand. CSA generated exactly vice-versa. This CL does a few things; it 1. reverts the recent change to load the limit from smi roots: Revert "[csa] Load the stack limit from smi roots" This reverts commit 507c29c9. 2. tweaks the CSA instruction sequence to output what the matcher expects. 3. refactors stack check matching into a new StackCheckMatcher class. 4. typifies CSA::PerformStackCheck as a drive-by. Bug: v8:6666,v8:7844 Change-Id: I9bb879ac10bfe7187750c5f9e7834dc4accf28b5 Reviewed-on: https://chromium-review.googlesource.com/1099068Reviewed-by: Leszek Swirski <leszeks@chromium.org> Reviewed-by: Sigurd Schneider <sigurds@chromium.org> Reviewed-by: Jaroslav Sevcik <jarin@chromium.org> Commit-Queue: Jakob Gruber <jgruber@chromium.org> Cr-Commit-Position: refs/heads/master@{#53737}
-
Dominik Inführ authored
Use ItemParallelJob to walk ephemerons in parallel. Bug: chromium:844008 Change-Id: Iffc72422f7577458437764f42d13d3f2ee020758 Reviewed-on: https://chromium-review.googlesource.com/1100825 Commit-Queue: Dominik Inführ <dinfuehr@google.com> Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Cr-Commit-Position: refs/heads/master@{#53736}
-
Georg Neis authored
Bug: v8:7790 Change-Id: I0508596370470068ee07bfd7e441a4e393266c11 Reviewed-on: https://chromium-review.googlesource.com/1099238Reviewed-by: Jaroslav Sevcik <jarin@chromium.org> Commit-Queue: Georg Neis <neis@chromium.org> Cr-Commit-Position: refs/heads/master@{#53735}
-
Michael Starzinger authored
This allows WebAssembly runtime stubs implemented as {WasmCode} to be called with regular stub linkage. So far we have only been able to call such stubs with WebAssembly linkage. Also switch two more on-heap builtins over to WebAssembly runtime stubs. R=clemensh@chromium.org BUG=v8:7424 Change-Id: Ifa553b5908ee27a1be780c325a114449d7fe7001 Reviewed-on: https://chromium-review.googlesource.com/1100882Reviewed-by: Clemens Hammacher <clemensh@chromium.org> Commit-Queue: Michael Starzinger <mstarzinger@chromium.org> Cr-Commit-Position: refs/heads/master@{#53734}
-
Clemens Hammacher authored
This is a reland of 0909dbe3. Added missing V8_EXPORT_PRIVATE to AndroidLogStream. TBR=mstarzinger@chromium.org Original change's description: > Introduce StdoutStream which prints to Android log or stdout > > The often used construct {OFStream(stdout)} does not work on Android. > This CL introduces an {StdoutStream} which behaves exactly like > {OFStream(stdout)} on non-android platforms, and redirects to the > Android log on appropriate systems and configurations. > > R=mstarzinger@chromium.org > > Bug: v8:7820 > Change-Id: Ia682fdf6d064e37c605c19b032f5a10b96ac825b > Reviewed-on: https://chromium-review.googlesource.com/1088911 > Reviewed-by: Benedikt Meurer <bmeurer@chromium.org> > Reviewed-by: Jakob Gruber <jgruber@chromium.org> > Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> > Commit-Queue: Clemens Hammacher <clemensh@chromium.org> > Cr-Commit-Position: refs/heads/master@{#53692} Bug: v8:7820 Change-Id: I8164bad78a401dbe4246c9ffcacd050fe511ed58 Reviewed-on: https://chromium-review.googlesource.com/1100636Reviewed-by: Clemens Hammacher <clemensh@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org> Cr-Commit-Position: refs/heads/master@{#53733}
-
Clemens Hammacher authored
R=mstarzinger@chromium.org Bug: v8:7754 Change-Id: I1da5aea2a67047ea8ed48e2b3080d2b8cbf97100 Reviewed-on: https://chromium-review.googlesource.com/1100878Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org> Cr-Commit-Position: refs/heads/master@{#53732}
-
Leszek Swirski authored
Bug: v8:7786 Change-Id: Id6a2e38e99fdaeaa619c7ec3e18865c3f64a2a47 Reviewed-on: https://chromium-review.googlesource.com/1095112Reviewed-by: Toon Verwaest <verwaest@chromium.org> Commit-Queue: Leszek Swirski <leszeks@chromium.org> Cr-Commit-Position: refs/heads/master@{#53731}
-
Igor Sheludko authored
Bug: v8:5269 Change-Id: I78678aee42b2ae930b995cd194b4d20516e0d229 Reviewed-on: https://chromium-review.googlesource.com/1098929 Commit-Queue: Igor Sheludko <ishell@chromium.org> Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> Cr-Commit-Position: refs/heads/master@{#53730}
-
Clemens Hammacher authored
Extract code generation (for the trampoline) from {wasm-code-manager.cc} to a new {JumpTableAssembler}. This prepares a CL to add more logic to the {JumpTableAssembler} to also generate jump tables for lazy compilation and tier up. R=mstarzinger@chromium.org Change-Id: I383585b7e4b5a4af3ca08d07e374b44654c1a09f Reviewed-on: https://chromium-review.googlesource.com/1046585 Commit-Queue: Clemens Hammacher <clemensh@chromium.org> Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> Cr-Commit-Position: refs/heads/master@{#53729}
-
Dominik Inführ authored
New flag for disabling of parallel marking after visiting all ephemerons. Bug: chromium:844008 Change-Id: I3dfc4e6a05ffc8e065313ef4955279617246802c Reviewed-on: https://chromium-review.googlesource.com/1100468Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Commit-Queue: Dominik Inführ <dinfuehr@google.com> Cr-Commit-Position: refs/heads/master@{#53728}
-
Peter Marshall authored
The allocations vector does not need to be dynamically allocated, we can just std::move it around instead. Change-Id: If38af59deeccc06005397f255e18a2fa1bdf4298 Reviewed-on: https://chromium-review.googlesource.com/1099063 Commit-Queue: Peter Marshall <petermarshall@chromium.org> Reviewed-by: Hannes Payer <hpayer@chromium.org> Reviewed-by: Tobias Tebbi <tebbi@chromium.org> Cr-Commit-Position: refs/heads/master@{#53727}
-
Stephan Herhut authored
On 64 bit architectures, reading memory in wasm requires a conversion of the 32 bit index into a 64 bit value. For this, we generate a ChangeUint32ToUint64 graph node, which later materializes as a move and hence consumes a register. This generates unneccesary register pressure, especially with gvn enabled. Now, the WasmGraphBuilder will emit a IntPtrConstant node right away if the index is a constant. Change-Id: Id8d7efa90c6bd8e4d7b6419e2075802dfc1eb383 Reviewed-on: https://chromium-review.googlesource.com/1099061 Commit-Queue: Stephan Herhut <herhut@chromium.org> Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> Cr-Commit-Position: refs/heads/master@{#53726}
-
Michael Achenbach authored
This reverts commit 0909dbe3. Reason for revert: Blocks roll: https://chromium-review.googlesource.com/c/chromium/src/+/1099143 Original change's description: > Introduce StdoutStream which prints to Android log or stdout > > The often used construct {OFStream(stdout)} does not work on Android. > This CL introduces an {StdoutStream} which behaves exactly like > {OFStream(stdout)} on non-android platforms, and redirects to the > Android log on appropriate systems and configurations. > > R=mstarzinger@chromium.org > > Bug: v8:7820 > Change-Id: Ia682fdf6d064e37c605c19b032f5a10b96ac825b > Reviewed-on: https://chromium-review.googlesource.com/1088911 > Reviewed-by: Benedikt Meurer <bmeurer@chromium.org> > Reviewed-by: Jakob Gruber <jgruber@chromium.org> > Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> > Commit-Queue: Clemens Hammacher <clemensh@chromium.org> > Cr-Commit-Position: refs/heads/master@{#53692} TBR=mstarzinger@chromium.org,jarin@chromium.org,jgruber@chromium.org,clemensh@chromium.org,bmeurer@chromium.org Change-Id: Iadadd9a0df10dca0fad647138a83db50148e864d No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: v8:7820 Reviewed-on: https://chromium-review.googlesource.com/1100635Reviewed-by: Michael Achenbach <machenbach@chromium.org> Commit-Queue: Michael Achenbach <machenbach@chromium.org> Cr-Commit-Position: refs/heads/master@{#53725}
-
Wez authored
Commit() and GrowTo() iterate allocating pages, and call RewindPages() if an iteration fails. This is true even if the first iteration fails, in which case there are no pages to rewind, and RewindPages() DCHECKs. Only call RewindPages() if we are on the second or later iteration. Bug: chromium:851626 Change-Id: Ifb644416331b5129c679983bc6af0d21c3ce14d8 Reviewed-on: https://chromium-review.googlesource.com/1099605 Commit-Queue: Wez <wez@chromium.org> Reviewed-by: Michael Lippautz <mlippautz@chromium.org> Cr-Commit-Position: refs/heads/master@{#53724}
-
- 13 Jun, 2018 25 commits
-
-
Junliang Yan authored
Port 98d7b23e Original Commit Message: This uses a WebAssembly runtime stub for the out-of-line {DoubleToI} computation instead of a builtin specific to a certain Isolate. It is another step towards making {WasmCode} independent of the Isolate. R=mstarzinger@chromium.org, joransiu@ca.ibm.com, michael_dawson@ca.ibm.com BUG=v8:7424 LOG=N Change-Id: I2f78432134ea150bb00bea339a6e71c11aa625b0 Reviewed-on: https://chromium-review.googlesource.com/1099877Reviewed-by: Joran Siu <joransiu@ca.ibm.com> Commit-Queue: Junliang Yan <jyan@ca.ibm.com> Cr-Commit-Position: refs/heads/master@{#53723}
-
Aseem Garg authored
This is a reland of 2338a2fd Original change's description: > [wasm] Add simd mem and shift ops to interpreter > > R=clemensh@chromium.org > BUG=v8:6020 > > Change-Id: I5d95e4c23240ae4e174d896d31e1b9b1d89d9418 > Reviewed-on: https://chromium-review.googlesource.com/1096493 > Reviewed-by: Clemens Hammacher <clemensh@chromium.org> > Commit-Queue: Aseem Garg <aseemgarg@chromium.org> > Cr-Commit-Position: refs/heads/master@{#53717} Bug: v8:6020 Change-Id: I38a73f5e389617a05a12e0a9477544c4e3aa2883 Reviewed-on: https://chromium-review.googlesource.com/1099895Reviewed-by: Ben Smith <binji@chromium.org> Commit-Queue: Aseem Garg <aseemgarg@chromium.org> Cr-Commit-Position: refs/heads/master@{#53722}
-
Nebojsa Ciric authored
- Test that order of getter initialization doesn't change. - Test properties of each getter against the spec. Bug: v8:7684 Cq-Include-Trybots: luci.v8.try:v8_linux_noi18n_rel_ng Change-Id: I85d0d80947e55233f10f62f96fe33d4281db4315 Reviewed-on: https://chromium-review.googlesource.com/1083879 Commit-Queue: Sathya Gunasekaran <gsathya@chromium.org> Reviewed-by: Sathya Gunasekaran <gsathya@chromium.org> Cr-Commit-Position: refs/heads/master@{#53721}
-
Junliang Yan authored
Port 7745c73a R=ishell@chromium.org, joransiu@ca.ibm.com, michael_dawson@ca.ibm.com BUG= LOG=N Change-Id: I34a7bda297486455ad3d809f2def490113bcf15c Reviewed-on: https://chromium-review.googlesource.com/1099640Reviewed-by: Joran Siu <joransiu@ca.ibm.com> Commit-Queue: Junliang Yan <jyan@ca.ibm.com> Cr-Commit-Position: refs/heads/master@{#53720}
-
Wez authored
R=sergiyb@chromium.org Bug: chromium:848028 Change-Id: If8ce38ff0e991e171eae68e2bea708365e63a35c Reviewed-on: https://chromium-review.googlesource.com/1099601 Commit-Queue: Wez <wez@chromium.org> Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org> Cr-Commit-Position: refs/heads/master@{#53719}
-
Sathya Gunasekaran authored
This reverts commit 2338a2fd. Reason for revert: broke mips see https://ci.chromium.org/buildbot/client.v8.ports/V8%20Mips%20-%20builder/17573 Original change's description: > [wasm] Add simd mem and shift ops to interpreter > > R=clemensh@chromium.org > BUG=v8:6020 > > Change-Id: I5d95e4c23240ae4e174d896d31e1b9b1d89d9418 > Reviewed-on: https://chromium-review.googlesource.com/1096493 > Reviewed-by: Clemens Hammacher <clemensh@chromium.org> > Commit-Queue: Aseem Garg <aseemgarg@chromium.org> > Cr-Commit-Position: refs/heads/master@{#53717} TBR=aseemgarg@chromium.org,clemensh@chromium.org Change-Id: I8e5b2e9a9c1c09d035335ba6681bbe3e1ce5abfb No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: v8:6020 Reviewed-on: https://chromium-review.googlesource.com/1099776Reviewed-by: Sathya Gunasekaran <gsathya@chromium.org> Commit-Queue: Sathya Gunasekaran <gsathya@chromium.org> Cr-Commit-Position: refs/heads/master@{#53718}
-
Aseem Garg authored
R=clemensh@chromium.org BUG=v8:6020 Change-Id: I5d95e4c23240ae4e174d896d31e1b9b1d89d9418 Reviewed-on: https://chromium-review.googlesource.com/1096493Reviewed-by: Clemens Hammacher <clemensh@chromium.org> Commit-Queue: Aseem Garg <aseemgarg@chromium.org> Cr-Commit-Position: refs/heads/master@{#53717}
-
jgruber authored
Embedded builtins are currently unsupported in no-snapshot builds. This lets BUILD.gn reflect that (both in the default value and an added assertion). Bug: v8:6666,v8:7837 Change-Id: I5c56f655733505e481017408f8a1a14d857f0b4a Reviewed-on: https://chromium-review.googlesource.com/1096758Reviewed-by: Michael Achenbach <machenbach@chromium.org> Commit-Queue: Jakob Gruber <jgruber@chromium.org> Cr-Commit-Position: refs/heads/master@{#53716}
-
Michael Achenbach authored
The check moved to gerrit. NOTRY=true TBR=sergiyb@chromium.org Bug: chromium:851737 Change-Id: I1db1f320bb1c71c8abbce29ef545cbd70ff4d168 Reviewed-on: https://chromium-review.googlesource.com/1099382Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org> Commit-Queue: Michael Achenbach <machenbach@chromium.org> Cr-Commit-Position: refs/heads/master@{#53715}
-
Junliang Yan authored
Port faf64532 Original Commit Message: Indirections for external references are now handled completely in macro assemblers, which can produce more efficient code. R=jgruber@chromium.org, joransiu@ca.ibm.com, michael_dawson@ca.ibm.com BUG= LOG=N Change-Id: Ic94019affc7418e2d69944f5d8932502f7912684 Reviewed-on: https://chromium-review.googlesource.com/1099421Reviewed-by: Joran Siu <joransiu@ca.ibm.com> Commit-Queue: Junliang Yan <jyan@ca.ibm.com> Cr-Commit-Position: refs/heads/master@{#53714}
-
Sigurd Schneider authored
Bug: v8:7327 Change-Id: I8cd57abf612393852532a695663175dff8e3a199 Reviewed-on: https://chromium-review.googlesource.com/1098955 Commit-Queue: Sigurd Schneider <sigurds@chromium.org> Reviewed-by: Georg Neis <neis@chromium.org> Cr-Commit-Position: refs/heads/master@{#53713}
-
Sigurd Schneider authored
Bug: v8:7327 Change-Id: I6f378f0d36444e8413dfe7ad3e097091e3b86df1 Reviewed-on: https://chromium-review.googlesource.com/1098919 Commit-Queue: Sigurd Schneider <sigurds@chromium.org> Reviewed-by: Jaroslav Sevcik <jarin@chromium.org> Cr-Commit-Position: refs/heads/master@{#53712}
-
Junliang Yan authored
Change-Id: Iefcee48e44b6eb6c00923500be03056e723d8550 Reviewed-on: https://chromium-review.googlesource.com/1095841Reviewed-by: Michael Achenbach <machenbach@chromium.org> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Commit-Queue: Junliang Yan <jyan@ca.ibm.com> Cr-Commit-Position: refs/heads/master@{#53711}
-
Michael Starzinger authored
The validation in {ValidateImportWrapperReferencesImmovables} is by now subsumed by the stricter {WasmCode::Validate}, which is applied to all WebAssembly code, not just import wrappers. R=titzer@chromium.org Change-Id: I8a8cf6e0f07cb289f33b641fe8f674e9698e7f44 Reviewed-on: https://chromium-review.googlesource.com/1099067Reviewed-by: Ben Titzer <titzer@chromium.org> Commit-Queue: Michael Starzinger <mstarzinger@chromium.org> Cr-Commit-Position: refs/heads/master@{#53710}
-
Ben L. Titzer authored
R=mstarzinger@chromium.org Change-Id: Ie7ad0277378af59860dd92482f90981bbdc216c8 Reviewed-on: https://chromium-review.googlesource.com/1099056 Commit-Queue: Ben Titzer <titzer@chromium.org> Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> Cr-Commit-Position: refs/heads/master@{#53709}
-
Ben L. Titzer authored
Lift the declaration of the heap allocation request list and the method which adds to the list up to AssemblerBase. Change-Id: I099260425af8cb579144998c71c538f19ba00e65 Reviewed-on: https://chromium-review.googlesource.com/1098959Reviewed-by: Georg Neis <neis@chromium.org> Commit-Queue: Ben Titzer <titzer@chromium.org> Cr-Commit-Position: refs/heads/master@{#53708}
-
Camillo Bruni authored
- Add typed IsHeapNumberPositive, IsNumberNonNegativeSafeInteger, IsInteger, IsSafeInteger and IsHeapNumberUint32 helpers on CodeStubAssembler - Type NumberIsInteger and NumberIsSafeInteger builtin Bug: chromium:847204, v8:6949 Change-Id: I27d3ab79bd17312c223209ed0b221c174024126e Reviewed-on: https://chromium-review.googlesource.com/1087961 Commit-Queue: Camillo Bruni <cbruni@chromium.org> Reviewed-by: Igor Sheludko <ishell@chromium.org> Cr-Commit-Position: refs/heads/master@{#53707}
-
Dominik Inführ authored
Bug: chromium:852308, chromium:844008 Change-Id: I99551c1f75d5916edfb780998963140b8282a570 Reviewed-on: https://chromium-review.googlesource.com/1099065 Commit-Queue: Dominik Inführ <dinfuehr@google.com> Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Cr-Commit-Position: refs/heads/master@{#53706}
-
Kanghua Yu authored
The jump optimization maybe run Turbofan pipeline twice for each TF/CS builtins, and relies on the fact that the number of j/jmp instruction generated is always the same. The behavior of {AddMatcher::SwapInputs} should be aware the two times code generation, and prevents the flipping of child nodes. For example: 1: Int32Add(2, 3) --- We shouldn't swap the input #2 and #3 in this situation 2: Int32Sub(4, 5) 3: Int32Add(6, 7) 4: ... 5: ... 6: ... 7: ... R=danno@chromium.org Bug: v8:7839 Change-Id: Ia97de3ab28294e595ac27b5898c099c0d782e9f9 Reviewed-on: https://chromium-review.googlesource.com/1098678Reviewed-by: Jaroslav Sevcik <jarin@chromium.org> Commit-Queue: Kanghua Yu <kanghua.yu@intel.com> Cr-Commit-Position: refs/heads/master@{#53705}
-
Michael Starzinger authored
R=clemensh@chromium.org Change-Id: Ib85efebbfc18861709186f5257b9f85f145bb6b4 Reviewed-on: https://chromium-review.googlesource.com/1097324 Commit-Queue: Michael Starzinger <mstarzinger@chromium.org> Reviewed-by: Clemens Hammacher <clemensh@chromium.org> Cr-Commit-Position: refs/heads/master@{#53704}
-
Daniel Clifford authored
In the process and as a test case of the module/file-handling, separate Array.p.forEach into its own Torque file. Bug: v8:7793 Change-Id: If45103a9df3bf8fade34e7bcf7c7c9c060e25966 Reviewed-on: https://chromium-review.googlesource.com/1097755Reviewed-by: Tobias Tebbi <tebbi@chromium.org> Commit-Queue: Daniel Clifford <danno@chromium.org> Cr-Commit-Position: refs/heads/master@{#53703}
-
Michael Starzinger authored
This uses a WebAssembly runtime stub for the out-of-line {DoubleToI} computation instead of a builtin specific to a certain Isolate. It is another step towards making {WasmCode} independent of the Isolate. R=clemensh@chromium.org BUG=v8:7424 Change-Id: Ifdaa8e2511b67468d75e0e4aaf70010ced04a11a Reviewed-on: https://chromium-review.googlesource.com/1098672 Commit-Queue: Michael Starzinger <mstarzinger@chromium.org> Reviewed-by: Clemens Hammacher <clemensh@chromium.org> Reviewed-by: Jaroslav Sevcik <jarin@chromium.org> Cr-Commit-Position: refs/heads/master@{#53702}
-
Simon Zünd authored
R=tebbi@chromium.org Bug: v8:7793 Change-Id: I691b3682aec3269350ee02c29b48ce1d46a1ffcb Reviewed-on: https://chromium-review.googlesource.com/1098656Reviewed-by: Tobias Tebbi <tebbi@chromium.org> Commit-Queue: Simon Zünd <szuend@google.com> Cr-Commit-Position: refs/heads/master@{#53701}
-
Ben L. Titzer authored
Previously, we sent a critical low memory pressure notification when attempting to commit WASM code when the code manager was near the limit for total amount of code allocated. https://chromium-review.googlesource.com/c/v8/v8/+/1073412 "fixed" that, but it causes OOMs on Windows. Since we no longer have the isolate on the code manager, and thus cannot send this notification on commit, send the notification upon the next module creation. This is still not optimal, but should fix OOM issues for lots of small modules on Windows. BUG=v8:7845 R=mstarzinger@chromium.org CC=clemensh@chromium.org Change-Id: I6e20d0c1ee9bc6926a83e0c2fbdc9e9e453588ec Reviewed-on: https://chromium-review.googlesource.com/1098921 Commit-Queue: Ben Titzer <titzer@chromium.org> Reviewed-by: Clemens Hammacher <clemensh@chromium.org> Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> Cr-Commit-Position: refs/heads/master@{#53700}
-
Clemens Hammacher authored
No need to have a separately defined CallDescriptor. R=titzer@chromium.org Change-Id: Ic7c0ee87d458fa8e55bef4d750aa7f61a763237f Reviewed-on: https://chromium-review.googlesource.com/1098927Reviewed-by: Ben Titzer <titzer@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org> Cr-Commit-Position: refs/heads/master@{#53699}
-