src/arm/assembler-arm-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/arm/assembler-arm-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/arm/assembler-arm-inl.h

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

index 17831c87b4d1fa9ba6644ab1850eebb60dd7c75c..bfe9bc8335a384d9403512179456828b30d7526d 100644

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

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

@@ -149,6 +149,7 @@ Object** RelocInfo::target_object_address() {

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

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

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

Assembler::set_target_pointer_at(pc_, reinterpret_cast<Address>(target));

if (mode == UPDATE_WRITE_BARRIER &&

host() != NULL &&

« no previous file with comments | « no previous file | src/factory.h » ('j') | no next file with comments »