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

runtime/vm/code_descriptors.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/code_descriptors.h"
 
 namespace dart {
 
 void DescriptorList::AddDescriptor(RawPcDescriptors::Kind kind,
                                    intptr_t pc_offset,
@@ skipping 66 matching lines @@
   return Array::MakeArray(list_);
 }
 
 
 RawStackmap* StackmapTableBuilder::MapAt(intptr_t index) const {
   Stackmap& map = Stackmap::Handle();
   map ^= list_.At(index);
   return map.raw();
 }
 
+
+RawExceptionHandlers* ExceptionHandlerList::FinalizeExceptionHandlers(
+    uword entry_point) const {
+  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.
+    if (list_[i].handler_types == NULL) {
+      // Unreachable handler, entry not computed.
+      // Initialize it to some meaningful value.
+      bool has_catch_all = false;

[hausner, 2015/03/12 18:25:08]

const bool, or just use the literal false below. I would not hold it against
you.

[srdjan, 2015/03/12 18:28:44]

Done.

+      ASSERT((list_[i].outer_try_index == -1) &&
+             (list_[i].pc_offset == -1));  // It is uninitialized.
+      handlers.SetHandlerInfo(i,
+                              list_[i].outer_try_index,
+                              list_[i].pc_offset,
+                              list_[i].needs_stacktrace,
+                              has_catch_all);
+      handlers.SetHandledTypes(i, Array::null_array());
+    } else {
+      bool has_catch_all = ContainsDynamic(*list_[i].handler_types);

[hausner, 2015/03/12 18:25:08]

For consistency's sake, also const bool.

[srdjan, 2015/03/12 18:28:44]

Done.

+      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();
+}
+
+
 }  // namespace dart