src/elements.cc - Issue 1865903002: [elements] Fix merge conflict/resolution.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/elements.cc

Issue 1865903002: [elements] Fix merge conflict/resolution. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/elements.cc

diff --git a/src/elements.cc b/src/elements.cc

index 4117eedd414033b55d2cbd2999db537560401f14..9ab70bbfaf692e6aa572320cd37515ba91c886e6 100644

--- a/src/elements.cc

+++ b/src/elements.cc

@@ -1436,8 +1436,7 @@ class FastElementsAccessor : public ElementsAccessorBase<Subclass, KindTraits> {

}

if (entry == 0) {

FixedArray* empty = heap->empty_fixed_array();

- if (FastElementsAccessorSubclass::kind() ==

- FAST_SLOPPY_ARGUMENTS_ELEMENTS) {

+ if (Subclass::kind() == FAST_SLOPPY_ARGUMENTS_ELEMENTS) {

FixedArray::cast(obj->elements())->set(1, empty);

} else {

obj->set_elements(empty);

« no previous file with comments | « no previous file | no next file » | no next file with comments »