Do not create method extractors during JitOptimizer::TryExpandClasses…

…InICData. Closes #29230 Issue #29292 Issue #29293 R=erikcorry@google.com, vegorov@google.com Review-Url: https://codereview.chromium.org/2796283006 .
dart-lang · Apr 7, 2017 · 170bf10 · 170bf10
1 parent d0e450d
commit 170bf10
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/runtime/vm/jit_optimizer.cc b/runtime/vm/jit_optimizer.cc
@@ -141,10 +141,10 @@ bool JitOptimizer::TryCreateICData(InstanceCallInstr* call) {
         Array::Handle(Z, ArgumentsDescriptor::New(call->ArgumentCount(),
                                                   call->argument_names()));
     ArgumentsDescriptor args_desc(args_desc_array);
-    const Function& function =
-        Function::Handle(Z, Resolver::ResolveDynamicForReceiverClass(
-                                receiver_class, call->function_name(),
-                                args_desc, false /* allow add */));
+    bool allow_add = false;
+    const Function& function = Function::Handle(
+        Z, Resolver::ResolveDynamicForReceiverClass(
+               receiver_class, call->function_name(), args_desc, allow_add));
     if (function.IsNull()) {
       return false;
     }
@@ -175,10 +175,10 @@ bool JitOptimizer::TryCreateICData(InstanceCallInstr* call) {
           Array::Handle(Z, ArgumentsDescriptor::New(call->ArgumentCount(),
                                                     call->argument_names()));
       ArgumentsDescriptor args_desc(args_desc_array);
-      const Function& function =
-          Function::Handle(Z, Resolver::ResolveDynamicForReceiverClass(
-                                  owner_class, call->function_name(), args_desc,
-                                  false /* allow_add */));
+      bool allow_add = false;
+      const Function& function = Function::Handle(
+          Z, Resolver::ResolveDynamicForReceiverClass(
+                 owner_class, call->function_name(), args_desc, allow_add));
       if (!function.IsNull()) {
         const ICData& ic_data = ICData::ZoneHandle(
             Z, ICData::NewFrom(*call->ic_data(), class_ids.length()));
@@ -1458,8 +1458,10 @@ bool JitOptimizer::LookupMethodFor(int class_id,
   if (!cls.is_finalized()) return false;
   if (Array::Handle(cls.functions()).IsNull()) return false;
 
-  Function& target_function = Function::Handle(
-      Z, Resolver::ResolveDynamicForReceiverClass(cls, name, args_desc));
+  bool allow_add = false;
+  Function& target_function =
+      Function::Handle(Z, Resolver::ResolveDynamicForReceiverClass(
+                              cls, name, args_desc, allow_add));
   if (target_function.IsNull()) return false;
   *fn_return ^= target_function.raw();
   return true;