Fix issue 22800: Unreachable exception handlers do not have their handler types initialized. Initia…

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/ast.h"
 #include "vm/code_generator.h"
 #include "vm/globals.h"
@@ skipping 144 matching lines @@
 
   static bool ContainsDynamic(const Array& array) {
     for (intptr_t i = 0; i < array.Length(); i++) {
       if (array.At(i) == Type::DynamicType()) {
         return true;
       }
     }
     return false;
   }
 
-
-  RawExceptionHandlers* FinalizeExceptionHandlers(uword entry_point) {
-    intptr_t num_handlers = Length();
-    if (num_handlers == 0) {
-      return Object::empty_exception_handlers().raw();
-    }
-    const ExceptionHandlers& handlers =
-        ExceptionHandlers::Handle(ExceptionHandlers::New(num_handlers));
-    for (intptr_t i = 0; i < num_handlers; i++) {
-      // Assert that every element in the array has been initialized.
-      ASSERT(list_[i].handler_types != NULL);
-      bool has_catch_all = ContainsDynamic(*list_[i].handler_types);
-      handlers.SetHandlerInfo(i,
-                              list_[i].outer_try_index,
-                              list_[i].pc_offset,
-                              list_[i].needs_stacktrace,
-                              has_catch_all);
-      handlers.SetHandledTypes(i, *list_[i].handler_types);
-    }
-    return handlers.raw();
-  }
+  RawExceptionHandlers* FinalizeExceptionHandlers(uword entry_point) const;
 
  private:
   GrowableArray<struct HandlerDesc> list_;
   DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerList);
 };
 
 }  // namespace dart
 
 #endif  // VM_CODE_DESCRIPTORS_H_