src/objects.cc - Issue 23706002: Merged r16393, r16396 into trunk branch.

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/objects.cc

Issue 23706002: Merged r16393, r16396 into trunk branch. (Closed) Base URL: https://v8.googlecode.com/svn/trunk

Patch Set: Created 7 years, 4 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/objects.cc

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

index 3e4601a65e1176eeea207dd77e54590c9df40190..15cee1c2a8687813cecb5e15638b1342a672f6e2 100644

--- a/src/objects.cc

+++ b/src/objects.cc

@@ -7829,7 +7829,7 @@ MaybeObject* DescriptorArray::Merge(int verbatim,

int current_offset = 0;

for (descriptor = 0; descriptor < verbatim; descriptor++) {

if (GetDetails(descriptor).type() == FIELD) current_offset++;

- result->CopyFrom(descriptor, this, descriptor, witness);

+ result->CopyFrom(descriptor, other, descriptor, witness);

}

// |verbatim| -> |valid|

« no previous file with comments | « src/hydrogen-instructions.cc ('k') | src/version.cc » ('j') | no next file with comments »