Fix bug with captured parameters and optimized try-catch.

runtime/vm/scopes.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_SCOPES_H_
 #define VM_SCOPES_H_
 
 #include "platform/assert.h"
 #include "platform/globals.h"
 #include "vm/allocation.h"
@@ skipping 14 matching lines @@
                 const String& name,
                 const AbstractType& type)
     : token_pos_(token_pos),
       name_(name),
       owner_(NULL),
       type_(type),
       const_value_(NULL),
       is_final_(false),
       is_captured_(false),
       is_invisible_(false),
+      is_captured_parameter_(false),
       index_(LocalVariable::kUninitializedIndex) {
     ASSERT(type.IsZoneHandle());
     ASSERT(type.IsFinalized());
     ASSERT(name.IsSymbol());
   }
 
   intptr_t token_pos() const { return token_pos_; }
   const String& name() const { return name_; }
   LocalScope* owner() const { return owner_; }
   void set_owner(LocalScope* owner) {
@@ skipping 21 matching lines @@
   void set_index(int index) {
     ASSERT(index != kUninitializedIndex);
     index_ = index;
   }
 
   void set_invisible(bool value) {
     is_invisible_ = value;
   }
   bool is_invisible() const { return is_invisible_; }
 
+  bool is_captured_parameter() const { return is_captured_parameter_; }
+  void set_is_captured_parameter(bool value) {
+    is_captured_parameter_ = value;
+  }
+
   bool IsConst() const {
     return const_value_ != NULL;
   }
 
   void SetConstValue(const Instance& value) {
     ASSERT(value.IsZoneHandle() || value.IsReadOnlyHandle());
     const_value_ = &value;
   }
 
   const Instance* ConstValue() const {
@@ skipping 17 matching lines @@
   LocalScope* owner_;  // Local scope declaring this variable.
 
   const AbstractType& type_;  // Declaration type of local variable.
 
   const Instance* const_value_;   // NULL or compile-time const value.
 
   bool is_final_;  // If true, this variable is readonly.
   bool is_captured_;  // If true, this variable lives in the context, otherwise
                       // in the stack frame.
   bool is_invisible_;
+  bool is_captured_parameter_;
   int index_;  // Allocation index in words relative to frame pointer (if not
                // captured), or relative to the context pointer (if captured).
 
   friend class LocalScope;
   DISALLOW_COPY_AND_ASSIGN(LocalVariable);
 };
 
 
 class NameReference : public ZoneAllocated {
  public:
@@ skipping 244 matching lines @@
   // List of names referenced in this scope and its children that
   // are not resolved to local variables.
   GrowableArray<NameReference*> referenced_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_SCOPES_H_