Fix issue 20476: creating multiple LocalVariables with same name (finally_ret_val35), confuses the …

runtime/vm/parser.h

 // 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.
 
 #ifndef VM_PARSER_H_
 #define VM_PARSER_H_
 
 #include "include/dart_api.h"
 
 #include "platform/assert.h"
@@ skipping 29 matching lines @@
  public:
   ParsedFunction(Isolate* isolate, const Function& function)
       : function_(function),
         code_(Code::Handle(isolate, function.unoptimized_code())),
         node_sequence_(NULL),
         instantiator_(NULL),
         default_parameter_values_(Array::ZoneHandle(isolate, Array::null())),
         saved_current_context_var_(NULL),
         saved_entry_context_var_(NULL),
         expression_temp_var_(NULL),
+        finally_return_temp_var_(NULL),
         deferred_prefixes_(new ZoneGrowableArray<const LibraryPrefix*>()),
         first_parameter_index_(0),
         first_stack_local_index_(0),
         num_copied_params_(0),
         num_stack_locals_(0),
         isolate_(isolate) {
     ASSERT(function.IsZoneHandle());
   }
 
   const Function& function() const { return function_; }
@@ skipping 40 matching lines @@
     ASSERT(has_expression_temp_var());
     return expression_temp_var_;
   }
   void set_expression_temp_var(LocalVariable* value) {
     ASSERT(!has_expression_temp_var());
     expression_temp_var_ = value;
   }
   bool has_expression_temp_var() const {
     return expression_temp_var_ != NULL;
   }
+
+  LocalVariable* finally_return_temp_var() const {
+    ASSERT(has_finally_return_temp_var());
+    return finally_return_temp_var_;
+  }
+  void set_finally_return_temp_var(LocalVariable* value) {
+    ASSERT(!has_finally_return_temp_var());
+    finally_return_temp_var_ = value;
+  }
+  bool has_finally_return_temp_var() const {
+    return finally_return_temp_var_ != NULL;
+  }
+  LocalVariable* EnsureFinallyReturnTemp();
+
   static LocalVariable* CreateExpressionTempVar(intptr_t token_pos);
   LocalVariable* EnsureExpressionTemp();
 
   bool HasDeferredPrefixes() const { return deferred_prefixes_->length() != 0; }
   ZoneGrowableArray<const LibraryPrefix*>* deferred_prefixes() const {
     return deferred_prefixes_;
   }
   void AddDeferredPrefix(const LibraryPrefix& prefix);
 
   int first_parameter_index() const { return first_parameter_index_; }
   int first_stack_local_index() const { return first_stack_local_index_; }
   int num_copied_params() const { return num_copied_params_; }
   int num_stack_locals() const { return num_stack_locals_; }
 
   void AllocateVariables();
 
   Isolate* isolate() const { return isolate_; }
 
  private:
   const Function& function_;
   Code& code_;
   SequenceNode* node_sequence_;
   LocalVariable* instantiator_;
   Array& default_parameter_values_;
   LocalVariable* saved_current_context_var_;
   LocalVariable* saved_entry_context_var_;
   LocalVariable* expression_temp_var_;
+  LocalVariable* finally_return_temp_var_;
   ZoneGrowableArray<const LibraryPrefix*>* deferred_prefixes_;
 
   int first_parameter_index_;
   int first_stack_local_index_;
   int num_copied_params_;
   int num_stack_locals_;
 
   Isolate* isolate_;
 
   DISALLOW_COPY_AND_ASSIGN(ParsedFunction);
@@ skipping 593 matching lines @@
   int16_t last_used_try_index_;
 
   bool unregister_pending_function_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_