src/ia32/stub-cache-ia32.cc - Issue 7860035: Merge bleeding edge up to 9192 into the GC 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/ia32/stub-cache-ia32.cc

Issue 7860035: Merge bleeding edge up to 9192 into the GC branch. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/gc

Patch Set: Created 9 years, 3 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/ia32/stub-cache-ia32.cc

diff --git a/src/ia32/stub-cache-ia32.cc b/src/ia32/stub-cache-ia32.cc

index d6c5aadee5803c94a6f76ee5620dd55187a5c50b..cd677dad75eda70e6ed5550ec40528974d195885 100644

--- a/src/ia32/stub-cache-ia32.cc

+++ b/src/ia32/stub-cache-ia32.cc

@@ -273,7 +273,7 @@ static void GenerateStringCheck(MacroAssembler* masm,

// Check that the object is a string.

__ mov(scratch, FieldOperand(receiver, HeapObject::kMapOffset));

__ movzx_b(scratch, FieldOperand(scratch, Map::kInstanceTypeOffset));

- ASSERT(kNotStringTag != 0);

+ STATIC_ASSERT(kNotStringTag != 0);

__ test(scratch, Immediate(kNotStringTag));

__ j(not_zero, non_string_object);

}

« no previous file with comments | « src/ia32/regexp-macro-assembler-ia32.cc ('k') | src/isolate.h » ('j') | no next file with comments »