Collect debugging info for catch clauses

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/cha.h"
 #include "vm/dart_entry.h"
@@ skipping 278 matching lines @@
   for (intptr_t i = 0; i < slow_path_code_.length(); i++) {
     slow_path_code_[i]->EmitNativeCode(this);
   }
   for (intptr_t i = 0; i < deopt_infos_.length(); i++) {
     deopt_infos_[i]->GenerateCode(this, i);
   }
 }
 
 
 void FlowGraphCompiler::AddExceptionHandler(intptr_t try_index,
-                                            intptr_t pc_offset) {
-  exception_handlers_list_->AddHandler(try_index, pc_offset);
+                                            intptr_t outer_try_index,
+                                            intptr_t pc_offset,
+                                            const Array& handler_types) {
+  exception_handlers_list_->AddHandler(try_index,
+                                       outer_try_index,
+                                       pc_offset,
+                                       handler_types);
 }
 
 
 // Uses current pc position and try-index.
 void FlowGraphCompiler::AddCurrentDescriptor(PcDescriptors::Kind kind,
                                              intptr_t deopt_id,
                                              intptr_t token_pos) {
   pc_descriptors_list()->AddDescriptor(kind,
                                        assembler()->CodeSize(),
                                        deopt_id,
@@ skipping 825 matching lines @@
     const AbstractTypeArguments& type_arguments =
         AbstractTypeArguments::Handle(type.arguments());
     const bool is_raw_type = type_arguments.IsNull() ||
         type_arguments.IsRaw(type_arguments.Length());
     return is_raw_type;
   }
   return true;
 }
 
 }  // namespace dart