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

runtime/vm/flow_graph_compiler.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/globals.h"  // Needed here to get TARGET_ARCH_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
@@ skipping 32 matching lines @@
                                                    intptr_t slot_ix) {
   builder->AddReturnAddressBefore(function, deopt_id(), slot_ix);
 }
 
 
 RawDeoptInfo* CompilerDeoptInfo::CreateDeoptInfo(FlowGraphCompiler* compiler) {
   if (deoptimization_env_ == NULL) return DeoptInfo::null();
   const Function& function = compiler->parsed_function().function();
   // For functions with optional arguments, all incoming are copied to local
   // area below FP, deoptimization environment does not track them.
-  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();
   const intptr_t fixed_parameter_count =
       deoptimization_env_->fixed_parameter_count();
   DeoptInfoBuilder builder(compiler->object_table(), num_args);
 
   intptr_t slot_ix = 0;
   BuildReturnAddress(&builder, function, slot_ix++);
 
   // All locals between TOS and PC-marker.
   const GrowableArray<Value*>& values = deoptimization_env_->values();
 
@@ skipping 56 matching lines @@
   for (int i = 0; i < block_info_.length(); ++i) {
     ASSERT(!block_info_[i]->label.IsLinked());
     ASSERT(!block_info_[i]->label.HasNear());
   }
 }
 
 
 bool FlowGraphCompiler::IsLeaf() const {
   return is_dart_leaf_ &&
          !parsed_function_.function().IsClosureFunction() &&
-         (parsed_function().copied_parameter_count() == 0);
+         (parsed_function().num_copied_params() == 0);
 }
 
 
 bool FlowGraphCompiler::HasFinally() const {
   return parsed_function().function().has_finally();
 }
 
 
 void FlowGraphCompiler::InitCompiler() {
   pc_descriptors_list_ = new DescriptorList(64);
@@ skipping 47 matching lines @@
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 intptr_t FlowGraphCompiler::StackSize() const {
   if (is_optimizing_) {
     return block_order_[0]->AsGraphEntry()->spill_slot_count();
   } else {
-    return parsed_function_.stack_local_count() +
-        parsed_function_.copied_parameter_count();
+    return parsed_function_.num_stack_locals() +
+        parsed_function_.num_copied_params();
   }
 }
 
 
 Label* FlowGraphCompiler::GetBlockLabel(
     BlockEntryInstr* block_entry) const {
   intptr_t block_index = block_entry->postorder_number();
   return &block_info_[block_index]->label;
 }
 
@@ skipping 632 matching lines @@
     case ABOVE:         return unsigned_left > unsigned_right;
     case ABOVE_EQUAL:   return unsigned_left >= unsigned_right;
     default:
       UNIMPLEMENTED();
       return false;
   }
 }
 
 
 }  // namespace dart