Commit b8cfe685 authored by cbruni's avatar cbruni Committed by Commit bot

[elements] Fix merge conflict/resolution.

BUG=

NOTRY=true
NOPRESUBMIT=true
NOTREECHECKS=true

Review URL: https://codereview.chromium.org/1865903002

Cr-Commit-Position: refs/heads/master@{#35303}
parent ca5b896f
...@@ -1436,8 +1436,7 @@ class FastElementsAccessor : public ElementsAccessorBase<Subclass, KindTraits> { ...@@ -1436,8 +1436,7 @@ class FastElementsAccessor : public ElementsAccessorBase<Subclass, KindTraits> {
} }
if (entry == 0) { if (entry == 0) {
FixedArray* empty = heap->empty_fixed_array(); FixedArray* empty = heap->empty_fixed_array();
if (FastElementsAccessorSubclass::kind() == if (Subclass::kind() == FAST_SLOPPY_ARGUMENTS_ELEMENTS) {
FAST_SLOPPY_ARGUMENTS_ELEMENTS) {
FixedArray::cast(obj->elements())->set(1, empty); FixedArray::cast(obj->elements())->set(1, empty);
} else { } else {
obj->set_elements(empty); obj->set_elements(empty);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment