| Index: src/runtime.cc
|
| diff --git a/src/runtime.cc b/src/runtime.cc
|
| index 9e389492eca14cf87aec73a292b6a4794bd21e3e..d40eab9d462f2f95da1cb131983a8d7d0fe64abe 100644
|
| --- a/src/runtime.cc
|
| +++ b/src/runtime.cc
|
| @@ -1748,8 +1748,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_RegExpExec) {
|
| Handle<Object> result = RegExpImpl::Exec(regexp,
|
| subject,
|
| index,
|
| - last_match_info,
|
| - isolate->zone());
|
| + last_match_info);
|
| if (result.is_null()) return Failure::Exception();
|
| return *result;
|
| }
|
| @@ -3083,8 +3082,7 @@ MUST_USE_RESULT static MaybeObject* StringReplaceRegExpWithString(
|
| Handle<Object> match = RegExpImpl::Exec(regexp_handle,
|
| subject_handle,
|
| 0,
|
| - last_match_info_handle,
|
| - isolate->zone());
|
| + last_match_info_handle);
|
| if (match.is_null()) {
|
| return Failure::Exception();
|
| }
|
| @@ -3185,8 +3183,7 @@ MUST_USE_RESULT static MaybeObject* StringReplaceRegExpWithString(
|
| match = RegExpImpl::Exec(regexp_handle,
|
| subject_handle,
|
| next,
|
| - last_match_info_handle,
|
| - isolate->zone());
|
| + last_match_info_handle);
|
| if (match.is_null()) {
|
| return Failure::Exception();
|
| }
|
| @@ -3242,8 +3239,7 @@ MUST_USE_RESULT static MaybeObject* StringReplaceRegExpWithEmptyString(
|
| Handle<Object> match = RegExpImpl::Exec(regexp_handle,
|
| subject_handle,
|
| 0,
|
| - last_match_info_handle,
|
| - isolate->zone());
|
| + last_match_info_handle);
|
| if (match.is_null()) return Failure::Exception();
|
| if (match->IsNull()) return *subject_handle;
|
|
|
| @@ -3317,8 +3313,7 @@ MUST_USE_RESULT static MaybeObject* StringReplaceRegExpWithEmptyString(
|
| match = RegExpImpl::Exec(regexp_handle,
|
| subject_handle,
|
| next,
|
| - last_match_info_handle,
|
| - isolate->zone());
|
| + last_match_info_handle);
|
| if (match.is_null()) return Failure::Exception();
|
| if (match->IsNull()) break;
|
|
|
| @@ -3733,8 +3728,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_StringMatch) {
|
| CONVERT_ARG_HANDLE_CHECKED(JSArray, regexp_info, 2);
|
| HandleScope handles;
|
|
|
| - Handle<Object> match = RegExpImpl::Exec(regexp, subject, 0, regexp_info,
|
| - isolate->zone());
|
| + Handle<Object> match = RegExpImpl::Exec(regexp, subject, 0, regexp_info);
|
|
|
| if (match.is_null()) {
|
| return Failure::Exception();
|
| @@ -3759,8 +3753,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_StringMatch) {
|
| offsets.Add(start, zone);
|
| offsets.Add(end, zone);
|
| if (start == end) if (++end > length) break;
|
| - match = RegExpImpl::Exec(regexp, subject, end, regexp_info,
|
| - isolate->zone());
|
| + match = RegExpImpl::Exec(regexp, subject, end, regexp_info);
|
| if (match.is_null()) {
|
| return Failure::Exception();
|
| }
|
| @@ -3858,8 +3851,7 @@ static int SearchRegExpNoCaptureMultiple(
|
| int match_start = -1;
|
| int match_end = 0;
|
| int pos = 0;
|
| - int registers_per_match = RegExpImpl::IrregexpPrepare(regexp, subject,
|
| - isolate->zone());
|
| + int registers_per_match = RegExpImpl::IrregexpPrepare(regexp, subject);
|
| if (registers_per_match < 0) return RegExpImpl::RE_EXCEPTION;
|
|
|
| int max_matches;
|
| @@ -3874,8 +3866,7 @@ static int SearchRegExpNoCaptureMultiple(
|
| int num_matches = RegExpImpl::IrregexpExecRaw(regexp,
|
| subject,
|
| pos,
|
| - register_vector,
|
| - isolate->zone());
|
| + register_vector);
|
| if (num_matches > 0) {
|
| for (int match_index = 0; match_index < num_matches; match_index++) {
|
| int32_t* current_match = ®ister_vector[match_index * 2];
|
| @@ -3945,8 +3936,7 @@ static int SearchRegExpMultiple(
|
| FixedArrayBuilder* builder) {
|
|
|
| ASSERT(subject->IsFlat());
|
| - int registers_per_match = RegExpImpl::IrregexpPrepare(regexp, subject,
|
| - isolate->zone());
|
| + int registers_per_match = RegExpImpl::IrregexpPrepare(regexp, subject);
|
| if (registers_per_match < 0) return RegExpImpl::RE_EXCEPTION;
|
|
|
| int max_matches;
|
| @@ -3959,8 +3949,7 @@ static int SearchRegExpMultiple(
|
| int num_matches = RegExpImpl::IrregexpExecRaw(regexp,
|
| subject,
|
| 0,
|
| - register_vector,
|
| - isolate->zone());
|
| + register_vector);
|
|
|
| int capture_count = regexp->CaptureCount();
|
| int subject_length = subject->length();
|
| @@ -4046,8 +4035,7 @@ static int SearchRegExpMultiple(
|
| num_matches = RegExpImpl::IrregexpExecRaw(regexp,
|
| subject,
|
| pos,
|
| - register_vector,
|
| - isolate->zone());
|
| + register_vector);
|
| } while (num_matches > 0);
|
|
|
| if (num_matches != RegExpImpl::RE_EXCEPTION) {
|
|
|