Revert "Pull from svn bleeding_edge@3716"
This reverts commit 888f6729be6a6f6fbe246cb5a9f122e2dbe455b7.
(Waiting until v8 issue 554101 is in v8 rather than patching it straight into
android)
diff --git a/src/jsregexp.cc b/src/jsregexp.cc
index 505cf03..8af472d 100644
--- a/src/jsregexp.cc
+++ b/src/jsregexp.cc
@@ -4462,13 +4462,10 @@
while (i1 < n1 || i2 < n2) {
CharacterRange next_range;
int range_source;
- if (i2 == n2 ||
- (i1 < n1 && first_set->at(i1).from() < second_set->at(i2).from())) {
- // Next smallest element is in first set.
+ if (i2 == n2 || first_set->at(i1).from() < second_set->at(i2).from()) {
next_range = first_set->at(i1++);
range_source = kInsideFirst;
} else {
- // Next smallest element is in second set.
next_range = second_set->at(i2++);
range_source = kInsideSecond;
}