Mark exception handlers if they have a stacktrace specified. Do not build a stacktrace if the handl…

runtime/vm/flow_graph_builder.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/flow_graph_builder.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/ast_printer.h"
 #include "vm/bit_vector.h"
 #include "vm/code_descriptors.h"
@@ skipping 3461 matching lines @@
   // and ':stacktrace_var' can never be captured variables.
   ASSERT(!catch_block->exception_var().is_captured());
   ASSERT(!catch_block->stacktrace_var().is_captured());
 
   CatchBlockEntryInstr* catch_entry =
       new CatchBlockEntryInstr(owner()->AllocateBlockId(),
                                catch_handler_index,
                                catch_block->handler_types(),
                                try_handler_index,
                                catch_block->exception_var(),
-                               catch_block->stacktrace_var());
+                               catch_block->stacktrace_var(),
+                               catch_block->needs_stacktrace());
   owner()->AddCatchEntry(catch_entry);
   ASSERT(!for_catch.is_open());
   AppendFragment(catch_entry, for_catch);
   if (node->end_catch_label() != NULL) {
     JoinEntryInstr* join = node->end_catch_label()->join_for_continue();
     if (join != NULL) {
       if (is_open()) Goto(join);
       exit_ = join;
     }
   }
@@ skipping 20 matching lines @@
     ASSERT(!for_finally.is_open());
 
     const Array& types = Array::ZoneHandle(Array::New(1, Heap::kOld));
     types.SetAt(0, Type::Handle(Type::DynamicType()));
     CatchBlockEntryInstr* finally_entry =
         new CatchBlockEntryInstr(owner()->AllocateBlockId(),
                                  original_handler_index,
                                  types,
                                  catch_handler_index,
                                  catch_block->exception_var(),
-                                 catch_block->stacktrace_var());
+                                 catch_block->stacktrace_var(),
+                                 catch_block->needs_stacktrace());
     owner()->AddCatchEntry(finally_entry);
     AppendFragment(finally_entry, for_finally);
   }
 
   // Generate code for the finally block if one exists.
   if ((finally_block != NULL) && is_open()) {
     EffectGraphVisitor for_finally_block(owner(), temp_index());
     finally_block->Visit(&for_finally_block);
     Append(for_finally_block);
   }
@@ skipping 215 matching lines @@
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, function_name, reason) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart