src/arm/ic-arm.cc - Issue 2701003: Revert r4782. Fix issues 728, 732.

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/ic-arm.cc

Issue 2701003: Revert r4782. Fix issues 728, 732. (Closed)

Patch Set: fix review remarks, add static checks Created 10 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/ic-arm.cc

diff --git a/src/arm/ic-arm.cc b/src/arm/ic-arm.cc

index a7c436d61b3353d07e74febc5827f11835fb6211..42fdff29ba693ae95cee858745583f506c04a9ec 100644

--- a/src/arm/ic-arm.cc

+++ b/src/arm/ic-arm.cc

@@ -834,8 +834,8 @@ void KeyedLoadIC::GenerateGeneric(MacroAssembler* masm) {

// Is the string an array index, with cached numeric value?

__ ldr(r3, FieldMemOperand(r0, String::kHashFieldOffset));

- __ tst(r3, Operand(String::kIsArrayIndexMask));

- __ b(ne, &index_string);

+ __ tst(r3, Operand(String::kContainsCachedArrayIndexMask));

+ __ b(eq, &index_string);

// Is the string a symbol?

// r2: key map

« no previous file with comments | « no previous file | src/ia32/ic-ia32.cc » ('j') | src/objects.h » ('J')