src/x64/regexp-macro-assembler-x64.cc - Issue 6928060: Merge Label and NearLabel

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/regexp-macro-assembler-x64.cc

Issue 6928060: Merge Label and NearLabel (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 9 years, 7 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/regexp-macro-assembler-x64.cc

diff --git a/src/x64/regexp-macro-assembler-x64.cc b/src/x64/regexp-macro-assembler-x64.cc

index d4ccb0e019c2bc1a6ab116032adf982e0d643914..d39fc9ffdd4c246d5aec059e1f15bba8191999b2 100644

--- a/src/x64/regexp-macro-assembler-x64.cc

+++ b/src/x64/regexp-macro-assembler-x64.cc

@@ -1065,9 +1065,9 @@ void RegExpMacroAssemblerX64::ReadStackPointerFromRegister(int reg) {

void RegExpMacroAssemblerX64::SetCurrentPositionFromEnd(int by) {

- NearLabel after_position;

+ Label after_position;

__ cmpq(rdi, Immediate(-by * char_size()));

- __ j(greater_equal, &after_position);

+ __ j(greater_equal, &after_position, Label::kNear);

__ movq(rdi, Immediate(-by * char_size()));

// On RegExp code entry (where this operation is used), the character before

// the current position is expected to be already loaded.