[Atomics] Fix atomic access index validation

[Atomics] Fix atomic access index validation

BUG=v8:4737
LOG=n
R=jarin@chromium.org

Committed: https://crrev.com/88724ec4cb082583043e3b3dec4cda0a82dc696b
Cr-Commit-Position: refs/heads/master@{#35074}

[Jarin, 2016-02-08 09:00:35]

jarin@chromium.org changed reviewers:
+ bmeurer@chromium.org

[Jarin, 2016-02-08 09:00:35]

lgtm, but I am not an expert on the voodoo in the src/js/* files. Adding a
@bmeurer to do a proper review of that.

[Benedikt Meurer, 2016-02-08 10:05:39]

I guess it's OK for now. I don't have a better suggestion. We can clean it up
later if necessary. So LGTM from my side.

[binji, 2016-02-08 18:15:06]

The CQ bit was checked by binji@chromium.org

[commit-bot: I haz the power, 2016-02-08 18:15:20]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1676613002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1676613002/20001

[commit-bot: I haz the power, 2016-02-08 18:50:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-02-08 18:50:25]

Try jobs failed on following builders:
  v8_linux_arm64_rel on tryserver.v8 (JOB_FAILED,
http://build.chromium.org/p/tryserver.v8/builders/v8_linux_arm64_rel/builds/1...)

[binji, 2016-02-08 21:57:09]

The CQ bit was checked by binji@chromium.org

[commit-bot: I haz the power, 2016-02-08 21:57:17]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1676613002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1676613002/20001

[binji, 2016-02-08 22:16:57]

The CQ bit was unchecked by binji@chromium.org

[binji, 2016-02-08 23:00:17]

This seems to be failing only w/ Ignition in the ARM64 simulator. I was able to
repro locally, but I don't understand why it isn't working.

(gdb) bt
#0  0x00007ffff6c01cb7 in __GI_raise (sig=sig@entry=6) at
../nptl/sysdeps/unix/sysv/linux/raise.c:56
#1  0x00007ffff6c050a8 in __GI_abort () at abort.c:89
#2  0x0000000000c6b5e9 in v8::base::OS::Abort () at
../../../src/base/platform/platform-posix.cc:232
#3  0x0000000000c664a8 in V8_Fatal (file=0x1e7104d "../../../src/frames.cc",
line=98, format=0x19a4209 "Check failed: %s.") at
../../../src/base/logging.cc:116
#4  0x000000000107ca84 in v8::internal::StackFrameIterator::Advance
(this=0x7fffffffad20) at ../../../src/frames.cc:98
#5  0x000000000117ac5e in v8::internal::Isolate::Iterate (this=0x36a7220,
v=0x7fffffffb1a0, thread=0x36a8bd8) at ../../../src/isolate.cc:217
#6  0x000000000117ad35 in v8::internal::Isolate::Iterate (this=0x36a7220,
v=0x7fffffffb1a0) at ../../../src/isolate.cc:225
#7  0x00000000010c4e17 in v8::internal::Heap::IterateStrongRoots
(this=0x36a7240, v=0x7fffffffb1a0, mode=v8::internal::VISIT_ALL_IN_SCAVENGE) at
../../../src/heap/heap.cc:4564
#8  0x00000000010ae3e5 in v8::internal::Heap::IterateRoots (this=0x36a7240,
v=0x7fffffffb1a0, mode=v8::internal::VISIT_ALL_IN_SCAVENGE) at
../../../src/heap/heap.cc:4534
#9  0x00000000010ace9c in v8::internal::Heap::Scavenge (this=0x36a7240) at
../../../src/heap/heap.cc:1676
#10 0x00000000010ab7f2 in v8::internal::Heap::PerformGarbageCollection
(this=0x36a7240, collector=v8::internal::SCAVENGER,
gc_callback_flags=v8::kNoGCCallbackFlags) at ../../../src/heap/heap.cc:1311
#11 0x00000000010aae16 in v8::internal::Heap::CollectGarbage (this=0x36a7240,
collector=v8::internal::SCAVENGER, gc_reason=0x1e697e5 "allocation failure",
collector_reason=0x0, 
    gc_callback_flags=v8::kNoGCCallbackFlags) at ../../../src/heap/heap.cc:1010
#12 0x0000000000684393 in v8::internal::Heap::CollectGarbage (this=0x36a7240,
space=v8::internal::NEW_SPACE, gc_reason=0x1e697e5 "allocation failure",
callbackFlags=v8::kNoGCCallbackFlags)
    at ../../../src/heap/heap-inl.h:566
#13 0x00000000010665ca in v8::internal::Factory::New<v8::internal::JSFunction>
(this=0x36a7220, map=..., space=v8::internal::NEW_SPACE) at
../../../src/factory.cc:58
#14 0x00000000010662d1 in v8::internal::Factory::NewFunction (this=0x36a7220,
map=..., info=..., context=..., pretenure=v8::internal::NOT_TENURED) at
../../../src/factory.cc:1200
#15 0x00000000010683a0 in
v8::internal::Factory::NewFunctionFromSharedFunctionInfo (this=0x36a7220,
initial_map=..., info=..., context=..., pretenure=v8::internal::NOT_TENURED) at
../../../src/factory.cc:1353
#16 0x00000000010682b5 in
v8::internal::Factory::NewFunctionFromSharedFunctionInfo (this=0x36a7220,
info=..., context=..., pretenure=v8::internal::NOT_TENURED) at
../../../src/factory.cc:1343
#17 0x0000000001677b4b in v8::internal::__RT_impl_Runtime_InterpreterNewClosure
(args=..., isolate=0x36a7220) at ../../../src/runtime/runtime-interpreter.cc:151
#18 0x0000000001677991 in v8::internal::Runtime_InterpreterNewClosure
(args_length=2, args_object=0x7ffff4bc6158, isolate=0x36a7220) at
../../../src/runtime/runtime-interpreter.cc:145
#19 0x000000000145e630 in v8::internal::Simulator::DoRuntimeCall
(this=0x36d2350, instr=0x36f70d8) at ../../../src/arm64/simulator-arm64.cc:610
#20 0x000000000146ec42 in v8::internal::Simulator::VisitException
(this=0x36d2350, instr=0x36f70d8) at ../../../src/arm64/simulator-arm64.cc:3724
#21 0x00000000014715f2 in
v8::internal::Decoder<v8::internal::Simulator>::DecodeBranchSystemException
(this=0x36d2350, instr=0x36f70d8) at ../../../src/arm64/decoder-arm64-inl.h:156
#22 0x00000000014707a7 in v8::internal::Decoder<v8::internal::Simulator>::Decode
(this=0x36d2350, instr=0x36f70d8) at ../../../src/arm64/decoder-arm64-inl.h:62
#23 0x000000000145e13b in v8::internal::Simulator::ExecuteInstruction
(this=0x36d2350) at ../../../src/arm64/simulator-arm64.h:315
#24 0x000000000145e09d in v8::internal::Simulator::Run (this=0x36d2350) at
../../../src/arm64/simulator-arm64.cc:446
#25 0x000000000145cc5c in v8::internal::Simulator::CheckPCSComplianceAndRun
(this=0x36d2350) at ../../../src/arm64/simulator-arm64.cc:252
#26 0x000000000145c0e5 in v8::internal::Simulator::CallVoid (this=0x36d2350,
entry=0x7fffd4d19fa0 "?", args=0x7fffffffc0e0) at
../../../src/arm64/simulator-arm64.cc:162
#27 0x000000000145d0d7 in v8::internal::Simulator::CallInt64 (this=0x36d2350,
entry=0x7fffd4d19fa0 "?", args=0x7fffffffc0e0) at
../../../src/arm64/simulator-arm64.cc:169
#28 0x000000000145d257 in v8::internal::Simulator::CallJS (this=0x36d2350,
entry=0x7fffd4d19fa0 "?", new_target=0x51804139, target=0x5a3ff861,
revc=0x51804139, argc=3, argv=0x7fffffffc5e0)
    at ../../../src/arm64/simulator-arm64.cc:194
#29 0x00000000010494d1 in v8::internal::(anonymous namespace)::Invoke
(isolate=0x36a7220, is_construct=false, target=..., receiver=..., argc=3,
args=0x7fffffffc5e0, new_target=...)
    at ../../../src/execution.cc:97
#30 0x00000000010491e9 in v8::internal::Execution::Call (isolate=0x36a7220,
callable=..., receiver=..., argc=3, argv=0x7fffffffc5e0) at
../../../src/execution.cc:163
#31 0x0000000000d14154 in v8::internal::Bootstrapper::CompileNative
(isolate=0x36a7220, name=..., source=..., argc=3, argv=0x7fffffffc5e0,
natives_flag=v8::internal::NATIVES_CODE)
    at ../../../src/bootstrapper.cc:1908
#32 0x0000000000d13cb5 in v8::internal::Bootstrapper::CompileBuiltin
(isolate=0x36a7220, index=18) at ../../../src/bootstrapper.cc:1825
#33 0x0000000000d1bafe in v8::internal::Genesis::InstallNatives
(this=0x7fffffffd020, context_type=v8::internal::FULL_CONTEXT) at
../../../src/bootstrapper.cc:2671
#34 0x0000000000d21f7e in v8::internal::Genesis::Genesis (this=0x7fffffffd020,
isolate=0x36a7220, maybe_global_proxy=..., global_proxy_template=...,
extensions=0x7fffffffd200, 
    context_type=v8::internal::FULL_CONTEXT) at
../../../src/bootstrapper.cc:3569
#35 0x0000000000d068a4 in v8::internal::Bootstrapper::CreateEnvironment
(this=0x36c1450, maybe_global_proxy=..., global_proxy_template=...,
extensions=0x7fffffffd200, context_type=v8::internal::FULL_CONTEXT)
    at ../../../src/bootstrapper.cc:327
#36 0x0000000000c9a96f in v8::CreateEnvironment (isolate=0x36a7220,
extensions=0x7fffffffd200, global_template=..., maybe_global_proxy=...) at
../../../src/api.cc:5490
#37 0x0000000000c77bbc in v8::Context::New (external_isolate=0x36a7220,
extensions=0x7fffffffd200, global_template=..., global_object=...) at
../../../src/api.cc:5518
#38 0x00000000004c58c9 in LocalContext::Initialize (this=0x7fffffffd430,
isolate=0x36a7220, extensions=0x0, global_template=..., global_object=...) at
../../../test/cctest/cctest.h:309
#39 0x00000000004c580d in LocalContext::LocalContext (this=0x7fffffffd430,
extensions=0x0, global_template=..., global_object=...) at
../../../test/cctest/cctest.h:285
#40 0x000000000079c722 in TestFastReturnValues<v8::Object> () at
../../../test/cctest/test-api.cc:1173
#41 0x00000000006d4c6e in TestFastReturnValues () at
../../../test/cctest/test-api.cc:1258
#42 0x00000000005d3ea6 in CcTest::Run (this=0x363fbd0
<register_test_FastReturnValues>) at ../../../test/cctest/cctest.cc:94
#43 0x00000000005d4652 in main (argc=2, argv=0x7fffffffd918) at
../../../test/cctest/cctest.cc:230

[Jarin, 2016-02-09 09:45:59]

On 2016/02/08 23:00:17, binji wrote:
> This seems to be failing only w/ Ignition in the ARM64 simulator. I was able
to
> repro locally, but I don't understand why it isn't working.
> 
> (gdb) bt
> #0  0x00007ffff6c01cb7 in __GI_raise (sig=sig@entry=6) at
> ../nptl/sysdeps/unix/sysv/linux/raise.c:56
> #1  0x00007ffff6c050a8 in __GI_abort () at abort.c:89
> #2  0x0000000000c6b5e9 in v8::base::OS::Abort () at
> ../../../src/base/platform/platform-posix.cc:232
> #3  0x0000000000c664a8 in V8_Fatal (file=0x1e7104d "../../../src/frames.cc",
> line=98, format=0x19a4209 "Check failed: %s.") at
> ../../../src/base/logging.cc:116
> #4  0x000000000107ca84 in v8::internal::StackFrameIterator::Advance
> (this=0x7fffffffad20) at ../../../src/frames.cc:98
> #5  0x000000000117ac5e in v8::internal::Isolate::Iterate (this=0x36a7220,
> v=0x7fffffffb1a0, thread=0x36a8bd8) at ../../../src/isolate.cc:217
> #6  0x000000000117ad35 in v8::internal::Isolate::Iterate (this=0x36a7220,
> v=0x7fffffffb1a0) at ../../../src/isolate.cc:225
> #7  0x00000000010c4e17 in v8::internal::Heap::IterateStrongRoots
> (this=0x36a7240, v=0x7fffffffb1a0, mode=v8::internal::VISIT_ALL_IN_SCAVENGE)
at
> ../../../src/heap/heap.cc:4564
> #8  0x00000000010ae3e5 in v8::internal::Heap::IterateRoots (this=0x36a7240,
> v=0x7fffffffb1a0, mode=v8::internal::VISIT_ALL_IN_SCAVENGE) at
> ../../../src/heap/heap.cc:4534
> #9  0x00000000010ace9c in v8::internal::Heap::Scavenge (this=0x36a7240) at
> ../../../src/heap/heap.cc:1676
> #10 0x00000000010ab7f2 in v8::internal::Heap::PerformGarbageCollection
> (this=0x36a7240, collector=v8::internal::SCAVENGER,
> gc_callback_flags=v8::kNoGCCallbackFlags) at ../../../src/heap/heap.cc:1311
> #11 0x00000000010aae16 in v8::internal::Heap::CollectGarbage (this=0x36a7240,
> collector=v8::internal::SCAVENGER, gc_reason=0x1e697e5 "allocation failure",
> collector_reason=0x0, 
>     gc_callback_flags=v8::kNoGCCallbackFlags) at
../../../src/heap/heap.cc:1010
> #12 0x0000000000684393 in v8::internal::Heap::CollectGarbage (this=0x36a7240,
> space=v8::internal::NEW_SPACE, gc_reason=0x1e697e5 "allocation failure",
> callbackFlags=v8::kNoGCCallbackFlags)
>     at ../../../src/heap/heap-inl.h:566
> #13 0x00000000010665ca in v8::internal::Factory::New<v8::internal::JSFunction>
> (this=0x36a7220, map=..., space=v8::internal::NEW_SPACE) at
> ../../../src/factory.cc:58
> #14 0x00000000010662d1 in v8::internal::Factory::NewFunction (this=0x36a7220,
> map=..., info=..., context=..., pretenure=v8::internal::NOT_TENURED) at
> ../../../src/factory.cc:1200
> #15 0x00000000010683a0 in
> v8::internal::Factory::NewFunctionFromSharedFunctionInfo (this=0x36a7220,
> initial_map=..., info=..., context=..., pretenure=v8::internal::NOT_TENURED)
at
> ../../../src/factory.cc:1353
> #16 0x00000000010682b5 in
> v8::internal::Factory::NewFunctionFromSharedFunctionInfo (this=0x36a7220,
> info=..., context=..., pretenure=v8::internal::NOT_TENURED) at
> ../../../src/factory.cc:1343
> #17 0x0000000001677b4b in
v8::internal::__RT_impl_Runtime_InterpreterNewClosure
> (args=..., isolate=0x36a7220) at
../../../src/runtime/runtime-interpreter.cc:151
> #18 0x0000000001677991 in v8::internal::Runtime_InterpreterNewClosure
> (args_length=2, args_object=0x7ffff4bc6158, isolate=0x36a7220) at
> ../../../src/runtime/runtime-interpreter.cc:145
> #19 0x000000000145e630 in v8::internal::Simulator::DoRuntimeCall
> (this=0x36d2350, instr=0x36f70d8) at ../../../src/arm64/simulator-arm64.cc:610
> #20 0x000000000146ec42 in v8::internal::Simulator::VisitException
> (this=0x36d2350, instr=0x36f70d8) at
../../../src/arm64/simulator-arm64.cc:3724
> #21 0x00000000014715f2 in
> v8::internal::Decoder<v8::internal::Simulator>::DecodeBranchSystemException
> (this=0x36d2350, instr=0x36f70d8) at
../../../src/arm64/decoder-arm64-inl.h:156
> #22 0x00000000014707a7 in
v8::internal::Decoder<v8::internal::Simulator>::Decode
> (this=0x36d2350, instr=0x36f70d8) at ../../../src/arm64/decoder-arm64-inl.h:62
> #23 0x000000000145e13b in v8::internal::Simulator::ExecuteInstruction
> (this=0x36d2350) at ../../../src/arm64/simulator-arm64.h:315
> #24 0x000000000145e09d in v8::internal::Simulator::Run (this=0x36d2350) at
> ../../../src/arm64/simulator-arm64.cc:446
> #25 0x000000000145cc5c in v8::internal::Simulator::CheckPCSComplianceAndRun
> (this=0x36d2350) at ../../../src/arm64/simulator-arm64.cc:252
> #26 0x000000000145c0e5 in v8::internal::Simulator::CallVoid (this=0x36d2350,
> entry=0x7fffd4d19fa0 "?", args=0x7fffffffc0e0) at
> ../../../src/arm64/simulator-arm64.cc:162
> #27 0x000000000145d0d7 in v8::internal::Simulator::CallInt64 (this=0x36d2350,
> entry=0x7fffd4d19fa0 "?", args=0x7fffffffc0e0) at
> ../../../src/arm64/simulator-arm64.cc:169
> #28 0x000000000145d257 in v8::internal::Simulator::CallJS (this=0x36d2350,
> entry=0x7fffd4d19fa0 "?", new_target=0x51804139, target=0x5a3ff861,
> revc=0x51804139, argc=3, argv=0x7fffffffc5e0)
>     at ../../../src/arm64/simulator-arm64.cc:194
> #29 0x00000000010494d1 in v8::internal::(anonymous namespace)::Invoke
> (isolate=0x36a7220, is_construct=false, target=..., receiver=..., argc=3,
> args=0x7fffffffc5e0, new_target=...)
>     at ../../../src/execution.cc:97
> #30 0x00000000010491e9 in v8::internal::Execution::Call (isolate=0x36a7220,
> callable=..., receiver=..., argc=3, argv=0x7fffffffc5e0) at
> ../../../src/execution.cc:163
> #31 0x0000000000d14154 in v8::internal::Bootstrapper::CompileNative
> (isolate=0x36a7220, name=..., source=..., argc=3, argv=0x7fffffffc5e0,
> natives_flag=v8::internal::NATIVES_CODE)
>     at ../../../src/bootstrapper.cc:1908
> #32 0x0000000000d13cb5 in v8::internal::Bootstrapper::CompileBuiltin
> (isolate=0x36a7220, index=18) at ../../../src/bootstrapper.cc:1825
> #33 0x0000000000d1bafe in v8::internal::Genesis::InstallNatives
> (this=0x7fffffffd020, context_type=v8::internal::FULL_CONTEXT) at
> ../../../src/bootstrapper.cc:2671
> #34 0x0000000000d21f7e in v8::internal::Genesis::Genesis (this=0x7fffffffd020,
> isolate=0x36a7220, maybe_global_proxy=..., global_proxy_template=...,
> extensions=0x7fffffffd200, 
>     context_type=v8::internal::FULL_CONTEXT) at
> ../../../src/bootstrapper.cc:3569
> #35 0x0000000000d068a4 in v8::internal::Bootstrapper::CreateEnvironment
> (this=0x36c1450, maybe_global_proxy=..., global_proxy_template=...,
> extensions=0x7fffffffd200, context_type=v8::internal::FULL_CONTEXT)
>     at ../../../src/bootstrapper.cc:327
> #36 0x0000000000c9a96f in v8::CreateEnvironment (isolate=0x36a7220,
> extensions=0x7fffffffd200, global_template=..., maybe_global_proxy=...) at
> ../../../src/api.cc:5490
> #37 0x0000000000c77bbc in v8::Context::New (external_isolate=0x36a7220,
> extensions=0x7fffffffd200, global_template=..., global_object=...) at
> ../../../src/api.cc:5518
> #38 0x00000000004c58c9 in LocalContext::Initialize (this=0x7fffffffd430,
> isolate=0x36a7220, extensions=0x0, global_template=..., global_object=...) at
> ../../../test/cctest/cctest.h:309
> #39 0x00000000004c580d in LocalContext::LocalContext (this=0x7fffffffd430,
> extensions=0x0, global_template=..., global_object=...) at
> ../../../test/cctest/cctest.h:285
> #40 0x000000000079c722 in TestFastReturnValues<v8::Object> () at
> ../../../test/cctest/test-api.cc:1173
> #41 0x00000000006d4c6e in TestFastReturnValues () at
> ../../../test/cctest/test-api.cc:1258
> #42 0x00000000005d3ea6 in CcTest::Run (this=0x363fbd0
> <register_test_FastReturnValues>) at ../../../test/cctest/cctest.cc:94
> #43 0x00000000005d4652 in main (argc=2, argv=0x7fffffffd918) at
> ../../../test/cctest/cctest.cc:230

I have no idea, perhaps the interpreter guys have some idea, adding @rmcilroy.

[Jarin, 2016-02-09 09:46:20]

Description was changed from

==========
[Atomics] Fix atomic access index validation

BUG=v8:4737
LOG=n
R=jarin@chromium.org
==========

to

==========
[Atomics] Fix atomic access index validation

BUG=v8:4737
LOG=n
R=jarin@chromium.org
==========

[binji, 2016-03-24 21:59:14]

Coming back to this now. I've updated to head, and also to the new spec language
for validating the index.

PTAL

[binji, 2016-03-25 20:56:27]

On 2016/03/24 21:59:14, binji wrote:
> Coming back to this now. I've updated to head, and also to the new spec
language
> for validating the index.
> 
> PTAL

Landing w/ previous lgtms, since the main concern was that the previous src/js/
stuff was nasty (it's much nicer now).

[binji, 2016-03-25 20:56:33]

The CQ bit was checked by binji@chromium.org

[binji, 2016-03-25 20:56:33]

The patchset sent to the CQ was uploaded after l-g-t-m from
bmeurer@chromium.org, jarin@chromium.org
Link to the patchset: https://codereview.chromium.org/1676613002/#ps40001
(title: "update to latest version of spec")

[commit-bot: I haz the power, 2016-03-25 20:56:38]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1676613002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1676613002/40001

[commit-bot: I haz the power, 2016-03-25 20:58:48]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-25 20:58:49]

Try jobs failed on following builders:
  v8_presubmit on tryserver.v8 (JOB_FAILED,
http://build.chromium.org/p/tryserver.v8/builders/v8_presubmit/builds/12889)

[binji, 2016-03-25 21:28:25]

The CQ bit was checked by binji@chromium.org

[binji, 2016-03-25 21:28:25]

The patchset sent to the CQ was uploaded after l-g-t-m from
bmeurer@chromium.org, jarin@chromium.org
Link to the patchset: https://codereview.chromium.org/1676613002/#ps60001
(title: "merge master")

[commit-bot: I haz the power, 2016-03-25 21:28:35]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1676613002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1676613002/60001

[commit-bot: I haz the power, 2016-03-25 21:52:23]

Description was changed from

==========
[Atomics] Fix atomic access index validation

BUG=v8:4737
LOG=n
R=jarin@chromium.org
==========

to

==========
[Atomics] Fix atomic access index validation

BUG=v8:4737
LOG=n
R=jarin@chromium.org
==========

[commit-bot: I haz the power, 2016-03-25 21:52:24]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2016-03-25 21:53:04]

Description was changed from

==========
[Atomics] Fix atomic access index validation

BUG=v8:4737
LOG=n
R=jarin@chromium.org
==========

to

==========
[Atomics] Fix atomic access index validation

BUG=v8:4737
LOG=n
R=jarin@chromium.org

Committed: https://crrev.com/88724ec4cb082583043e3b3dec4cda0a82dc696b
Cr-Commit-Position: refs/heads/master@{#35074}
==========

[commit-bot: I haz the power, 2016-03-25 21:53:06]

Patchset 4 (id:??) landed as
https://crrev.com/88724ec4cb082583043e3b3dec4cda0a82dc696b
Cr-Commit-Position: refs/heads/master@{#35074}