Implement new optional parameters syntax in the vm (issue 4290).

runtime/vm/code_generator.cc

 // Copyright (c) 2012, 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/code_generator.h"
 
 #include "vm/assembler_macros.h"
 #include "vm/ast.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
@@ skipping 1468 matching lines @@
 }
 
 
 // Copy optimized frame into the isolate buffer.
 // The first incoming argument is stored at the last entry in the
 // copied frame buffer.
 static void CopyFrame(const Code& optimized_code, const StackFrame& frame) {
   const Function& function = Function::Handle(optimized_code.function());
   // Do not copy incoming arguments if there are optional arguments (they
   // are copied into local space at method entry).
-  const intptr_t num_args = (function.num_optional_parameters() > 0) ?
-      0 : function.num_fixed_parameters();
+  const intptr_t num_args =
+      function.HasOptionalParameters() ? 0 : function.num_fixed_parameters();
   // FP, PC-marker and return-address will be copied as well.
   const intptr_t frame_copy_size =
       1  // Deoptimized function's return address: caller_frame->pc().
       + ((frame.fp() - frame.sp()) / kWordSize)
       + 1  // PC marker.
       + 1  // Caller return address.
       + num_args;
   intptr_t* frame_copy = new intptr_t[frame_copy_size];
   ASSERT(frame_copy != NULL);
   // Include the return address of optimized code.
@@ skipping 46 matching lines @@
   // Compute the stack size of unoptimized frame
   const Array& deopt_info_array =
       Array::Handle(optimized_code.deopt_info_array());
   ASSERT(!deopt_info_array.IsNull());
   DeoptInfo& deopt_info = DeoptInfo::Handle();
   deopt_info ^= deopt_info_array.At(deopt_index);
   ASSERT(!deopt_info.IsNull());
   // For functions with optional argument deoptimization info does not
   // describe incoming arguments.
   const Function& function = Function::Handle(optimized_code.function());
-  const intptr_t num_args = (function.num_optional_parameters() > 0) ?
-      0 : function.num_fixed_parameters();
+  const intptr_t num_args =
+      function.HasOptionalParameters() ? 0 : function.num_fixed_parameters();
   intptr_t unoptimized_stack_size =
       + deopt_info.Length() - num_args
       - 2;  // Subtract caller FP and PC.
   return unoptimized_stack_size * kWordSize;
 }
 END_LEAF_RUNTIME_ENTRY
 
 
 
 static void DeoptimizeWithDeoptInfo(const Code& code,
                                     const DeoptInfo& deopt_info,
                                     const StackFrame& caller_frame) {
   const intptr_t len = deopt_info.Length();
   GrowableArray<DeoptInstr*> deopt_instructions(len);
   for (intptr_t i = 0; i < len; i++) {
     deopt_instructions.Add(DeoptInstr::Create(deopt_info.Instruction(i),
                                               deopt_info.FromIndex(i)));
   }
 
   intptr_t* start = reinterpret_cast<intptr_t*>(caller_frame.sp() - kWordSize);
   const Function& function = Function::Handle(code.function());
-  const intptr_t num_args = (function.num_optional_parameters() > 0) ?
-      0 : function.num_fixed_parameters();
+  const intptr_t num_args =
+      function.HasOptionalParameters() ? 0 : function.num_fixed_parameters();
   intptr_t to_frame_size =
       1  // Deoptimized function's return address.
       + (caller_frame.fp() - caller_frame.sp()) / kWordSize
       + 3  // caller-fp, pc, pc-marker.
       + num_args;
   DeoptimizationContext deopt_context(start,
                                       to_frame_size,
                                       Array::Handle(code.object_table()),
                                       num_args);
   for (intptr_t to_index = len - 1; to_index >= 0; to_index--) {
@@ skipping 85 matching lines @@
                 current->slot(),
                 current->value());
     }
 
     delete current;
   }
 }
 
 
 }  // namespace dart