src/x64/assembler-x64-inl.h - Issue 17176021: Merged r15193, r15263, r15267 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/x64/assembler-x64-inl.h

Issue 17176021: Merged r15193, r15263, r15267 into trunk branch. (Closed) Base URL: https://v8.googlecode.com/svn/trunk

Patch Set: Created 7 years, 6 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/x64/assembler-x64-inl.h

diff --git a/src/x64/assembler-x64-inl.h b/src/x64/assembler-x64-inl.h

index d1d6278c6687104b5df0bac7ef347cf9d9a686c4..1c231a70b62b5395d6b37bc333b751f2f7d98cdd 100644

--- a/src/x64/assembler-x64-inl.h

+++ b/src/x64/assembler-x64-inl.h

@@ -308,6 +308,7 @@ Address* RelocInfo::target_reference_address() {

void RelocInfo::set_target_object(Object* target, WriteBarrierMode mode) {

ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);

+ ASSERT(!target->IsConsString());

Memory::Object_at(pc_) = target;

CPU::FlushICache(pc_, sizeof(Address));

if (mode == UPDATE_WRITE_BARRIER &&

« no previous file with comments | « src/version.cc ('k') | test/mjsunit/regress/regress-embedded-cons-string.js » ('j') | no next file with comments »