Index: src/regexp/x87/regexp-macro-assembler-x87.cc |
diff --git a/src/regexp/x87/regexp-macro-assembler-x87.cc b/src/regexp/x87/regexp-macro-assembler-x87.cc |
index 01d0b249b6fe15b9f0d56e65742d6b0d6910c5f9..c1aa54f8f42de21cd4dfa6d97710365f79e90355 100644 |
--- a/src/regexp/x87/regexp-macro-assembler-x87.cc |
+++ b/src/regexp/x87/regexp-macro-assembler-x87.cc |
@@ -187,7 +187,6 @@ void RegExpMacroAssemblerX87::CheckGreedyLoop(Label* on_equal) { |
__ bind(&fallthrough); |
} |
- |
void RegExpMacroAssemblerX87::CheckNotBackReferenceIgnoreCase( |
int start_reg, bool read_backward, Label* on_no_match) { |
Label fallthrough; |
@@ -822,13 +821,15 @@ Handle<HeapObject> RegExpMacroAssemblerX87::GetCode(Handle<String> source) { |
__ test(edi, edi); |
__ j(zero, &exit_label_, Label::kNear); |
// Advance current position after a zero-length match. |
+ Label advance; |
+ __ bind(&advance); |
if (mode_ == UC16) { |
__ add(edi, Immediate(2)); |
} else { |
__ inc(edi); |
} |
+ if (global_unicode()) CheckNotInSurrogatePair(0, &advance); |
} |
- |
__ jmp(&load_char_start_regexp); |
} else { |
__ mov(eax, Immediate(SUCCESS)); |