Collect debugging info for catch clauses

runtime/vm/code_descriptors.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_CODE_DESCRIPTORS_H_
 #define VM_CODE_DESCRIPTORS_H_
 
 #include "vm/code_generator.h"
 #include "vm/globals.h"
 #include "vm/growable_array.h"
@@ skipping 80 matching lines @@
 
   Stackmap& stack_map_;
   GrowableObjectArray& list_;
   DISALLOW_COPY_AND_ASSIGN(StackmapTableBuilder);
 };
 
 
 class ExceptionHandlerList : public ZoneAllocated {
  public:
   struct HandlerDesc {
-    intptr_t try_index;  // Try block index handled by the handler.
-    intptr_t pc_offset;  // Handler PC offset value.
+    intptr_t try_index;        // Try block index handled by the handler.
+    intptr_t outer_try_index;  // Try block in which this try block is nested.
+    intptr_t pc_offset;        // Handler PC offset value.
+    const Array* handler_types;      // Catch clause guards.
   };
 
   ExceptionHandlerList() : list_() {}
 
   intptr_t Length() const {
     return list_.length();
   }
 
   intptr_t TryIndex(int index) const {
     return list_[index].try_index;
   }
+  intptr_t OuterTryIndex(int index) const {
+    return list_[index].outer_try_index;
+  }
   intptr_t PcOffset(int index) const {
     return list_[index].pc_offset;
   }
+  const Array& HandlerTypes(int index) const {
+    return *list_[index].handler_types;
+  }
   void SetPcOffset(int index, intptr_t handler_pc) {
     list_[index].pc_offset = handler_pc;
   }
 
-  void AddHandler(intptr_t try_index, intptr_t pc_offset) {
+  void AddHandler(intptr_t try_index,
+                  intptr_t outer_try_index,
+                  intptr_t pc_offset,
+                  const Array& handler_types) {
     struct HandlerDesc data;
     data.try_index = try_index;
+    data.outer_try_index = outer_try_index;
     data.pc_offset = pc_offset;
+    ASSERT(handler_types.IsZoneHandle());
+    data.handler_types = &handler_types;
     list_.Add(data);
   }
 
   RawExceptionHandlers* FinalizeExceptionHandlers(uword entry_point) {
     intptr_t num_handlers = Length();
     const ExceptionHandlers& handlers =
         ExceptionHandlers::Handle(ExceptionHandlers::New(num_handlers));
     for (intptr_t i = 0; i < num_handlers; i++) {
-      handlers.SetHandlerEntry(i, TryIndex(i), (entry_point + PcOffset(i)));
+      handlers.SetHandlerInfo(i, TryIndex(i), OuterTryIndex(i),
+                               (entry_point + PcOffset(i)));
+      handlers.SetHandledTypes(i, HandlerTypes(i));
     }
     return handlers.raw();
   }
 
  private:
   GrowableArray<struct HandlerDesc> list_;
   DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerList);
 };
 
 }  // namespace dart
 
 #endif  // VM_CODE_DESCRIPTORS_H_