VM: Simplify irregexp entry stub.

runtime/vm/regexp_assembler_ir.cc

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/regexp_assembler_ir.h"
 
 #include "vm/bit_vector.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 143 matching lines @@
   string_param_length_ = Local(Symbols::string_param_length());
   capture_length_ = Local(Symbols::capture_length());
   match_start_index_ = Local(Symbols::match_start_index());
   capture_start_index_ = Local(Symbols::capture_start_index());
   match_end_index_ = Local(Symbols::match_end_index());
   char_in_capture_ = Local(Symbols::char_in_capture());
   char_in_match_ = Local(Symbols::char_in_match());
   index_temp_ = Local(Symbols::index_temp());
   result_ = Local(Symbols::result());
 
-  string_param_ = Parameter(Symbols::string_param(), 0);
-  start_index_param_ = Parameter(Symbols::start_index_param(), 1);
+  string_param_ = Parameter(Symbols::string_param(),
+                            RegExpMacroAssembler::kParamStringIndex);
+  start_index_param_ = Parameter(Symbols::start_index_param(),
+                                 RegExpMacroAssembler::kParamStartOffsetIndex);
 }
 
 
 void IRRegExpMacroAssembler::GenerateEntryBlock() {
   set_current_instruction(entry_block_->normal_entry());
   TAG();
 
   // Store string.length.
   PushArgumentInstr* string_push = PushLocal(string_param_);
 
@@ skipping 123 matching lines @@
 static const bool kEnableUnalignedAccesses = false;
 #else
 static const bool kEnableUnalignedAccesses = true;
 #endif
 bool IRRegExpMacroAssembler::CanReadUnaligned() {
   return kEnableUnalignedAccesses && !slow_safe();
 }
 
 
 RawArray* IRRegExpMacroAssembler::Execute(
-    const Function& function,
+    const JSRegExp& regexp,
     const String& input,
     const Smi& start_offset,
     Zone* zone) {
+  const intptr_t cid = input.GetClassId();
+  const Function& fun = Function::Handle(regexp.function(cid));
+  ASSERT(!fun.IsNull());
   // Create the argument list.
-  const Array& args = Array::Handle(Array::New(2));
-  args.SetAt(0, input);
-  args.SetAt(1, start_offset);
+  const Array& args =
+      Array::Handle(Array::New(RegExpMacroAssembler::kParamCount));
+  args.SetAt(RegExpMacroAssembler::kParamRegExpIndex, regexp);
+  args.SetAt(RegExpMacroAssembler::kParamStringIndex, input);
+  args.SetAt(RegExpMacroAssembler::kParamStartOffsetIndex, start_offset);
 
   // And finally call the generated code.
 
   const Object& retval =
-      Object::Handle(zone, DartEntry::InvokeFunction(function, args));
+      Object::Handle(zone, DartEntry::InvokeFunction(fun, args));
   if (retval.IsError()) {
     const Error& error = Error::Cast(retval);
     OS::Print("%s\n", error.ToErrorCString());
     // Should never happen.
     UNREACHABLE();
   }
 
   if (retval.IsNull()) {
     return Array::null();
   }
@@ skipping 1582 matching lines @@
       index_val,
       characters,
       specialization_cid_,
       Scanner::kNoSourcePos));
 }
 
 
 #undef __
 
 }  // namespace dart