src/x64/code-stubs-x64.cc - Issue 11361171: Make kAsciiDataHintTag have correct semantics for all both 1 and 2 byte string types.

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/code-stubs-x64.cc

Issue 11361171: Make kAsciiDataHintTag have correct semantics for all both 1 and 2 byte string types. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/x64/code-stubs-x64.cc

diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc

index a8e52e99d306d0cedb44ab9f4ef74eedd10d85c0..9c9a266ac53cbef1eed6ac7a4dc238412ef9ffe9 100644

--- a/src/x64/code-stubs-x64.cc

+++ b/src/x64/code-stubs-x64.cc

@@ -4765,11 +4765,6 @@ void StringAddStub::Generate(MacroAssembler* masm) {

// r9: second instance type.

__ testb(rcx, Immediate(kAsciiDataHintMask));

__ j(not_zero, &ascii_data);

- __ xor_(r8, r9);

- STATIC_ASSERT(kOneByteStringTag != 0 && kAsciiDataHintTag != 0);

- __ andb(r8, Immediate(kOneByteStringTag | kAsciiDataHintTag));

- __ cmpb(r8, Immediate(kOneByteStringTag | kAsciiDataHintTag));

- __ j(equal, &ascii_data);

// Allocate a two byte cons string.

__ AllocateTwoByteConsString(rcx, rdi, no_reg, &call_runtime);

__ jmp(&allocated);

« no previous file with comments | « src/objects-inl.h ('k') | no next file » | no next file with comments »