Revert "VM(RegExp): Allow OSR optimization of RegExp :matcher functions."

runtime/vm/regexp.cc

Index: runtime/vm/regexp.cc
diff --git a/runtime/vm/regexp.cc b/runtime/vm/regexp.cc
index c9a42361db15e9079d3071e6a051bd34638d3e06..3516bc8423e5c5470188e4794bb6f39c02cc1dc5 100644
--- a/runtime/vm/regexp.cc
+++ b/runtime/vm/regexp.cc
@@ -3029,7 +3029,6 @@ void BoyerMooreLookahead::EmitSkipInstructions(RegExpMacroAssembler* masm) {
   BlockLabel cont, again;
 
   masm->BindBlock(&again);
-  masm->CheckPreemption(/*is_backtrack=*/false);
   masm->LoadCurrentCharacter(max_lookahead, &cont, true);
   masm->CheckBitInTable(boolean_skip_table, &cont);
   masm->AdvanceCurrentPosition(skip_distance);
@@ -3236,7 +3235,6 @@ Trace* ChoiceNode::EmitGreedyLoop(RegExpCompiler* compiler,
   greedy_match_trace.set_backtrack(&greedy_match_failed);
   BlockLabel loop_label;
   macro_assembler->BindBlock(&loop_label);
-  macro_assembler->CheckPreemption(/*is_backtrack=*/false);
   greedy_match_trace.set_stop_node(this);
   greedy_match_trace.set_loop_label(&loop_label);
   (*alternatives_)[0].node()->Emit(compiler, &greedy_match_trace);
@@ -4820,8 +4818,7 @@ void TextNode::FillInBMInfo(intptr_t initial_offset,
 RegExpEngine::CompilationResult RegExpEngine::CompileIR(
     RegExpCompileData* data,
     const ParsedFunction* parsed_function,
-    const ZoneGrowableArray<const ICData*>& ic_data_array,
-    intptr_t osr_id) {
+    const ZoneGrowableArray<const ICData*>& ic_data_array) {
   ASSERT(!FLAG_interpret_irregexp);
   Zone* zone = Thread::Current()->zone();
 
@@ -4897,9 +4894,9 @@ RegExpEngine::CompilationResult RegExpEngine::CompileIR(
 
   // Native regexp implementation.
 
-  IRRegExpMacroAssembler* macro_assembler = new (zone)
-      IRRegExpMacroAssembler(specialization_cid, data->capture_count,
-                             parsed_function, ic_data_array, osr_id, zone);
+  IRRegExpMacroAssembler* macro_assembler =
+      new (zone) IRRegExpMacroAssembler(specialization_cid, data->capture_count,
+                                        parsed_function, ic_data_array, zone);
 
   // Inserted here, instead of in Assembler, because it depends on information
   // in the AST that isn't replicated in the Node structure.