Move HandlerList to shared ExceptionHandlerList.

runtime/vm/code_generator_x64.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_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/code_generator.h"
 
 #include "lib/error.h"
@@ skipping 12 matching lines @@
 namespace dart {
 
 DEFINE_FLAG(bool, print_ast, false, "Print abstract syntax tree.");
 DEFINE_FLAG(bool, print_scopes, false, "Print scopes of local variables.");
 DEFINE_FLAG(bool, trace_functions, false, "Trace entry of each function.");
 DECLARE_FLAG(bool, enable_type_checks);
 DECLARE_FLAG(bool, trace_compiler);
 
 #define __ assembler_->
 
-
-// TODO(regis): CodeGeneratorState, CodeGenerator::DescriptorList, and
-// CodeGenerator::HandlerList can probably be moved to code_generator.cc, since
-// they seem to be architecture independent.
-
-
 CodeGeneratorState::CodeGeneratorState(CodeGenerator* codegen)
     : StackResource(Isolate::Current()),
       codegen_(codegen),
       parent_(codegen->state()) {
   if (parent_ != NULL) {
     root_node_ = parent_->root_node_;
     current_try_index_ = parent_->current_try_index_;
   } else {
     root_node_ = NULL;
     current_try_index_ = CatchClauseNode::kInvalidTryIndex;
   }
   codegen_->set_state(this);
 }
 
 
 CodeGeneratorState::~CodeGeneratorState() {
   codegen_->set_state(parent_);
 }
 
 
-class CodeGenerator::HandlerList : public ZoneAllocated {
- public:
-  struct HandlerDesc {
-    intptr_t try_index;  // Try block index handled by the handler.
-    intptr_t pc_offset;  // Handler PC offset value.
-  };
-
-  HandlerList() : list_() {
-  }
-  ~HandlerList() { }
-
-  intptr_t Length() const {
-    return list_.length();
-  }
-
-  intptr_t TryIndex(int index) const {
-    return list_[index].try_index;
-  }
-  intptr_t PcOffset(int index) const {
-    return list_[index].pc_offset;
-  }
-  void SetPcOffset(int index, intptr_t handler_pc) {
-    list_[index].pc_offset = handler_pc;
-  }
-
-  void AddHandler(intptr_t try_index, intptr_t pc_offset) {
-    struct HandlerDesc data;
-    data.try_index = try_index;
-    data.pc_offset = pc_offset;
-    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)));
-    }
-    return handlers.raw();
-  }
-
- private:
-  GrowableArray<struct HandlerDesc> list_;
-  DISALLOW_COPY_AND_ASSIGN(HandlerList);
-};
-
-
 CodeGenerator::CodeGenerator(Assembler* assembler,
                              const ParsedFunction& parsed_function)
     : assembler_(assembler),
       parsed_function_(parsed_function),
       locals_space_size_(-1),
       state_(NULL),
       pc_descriptors_list_(NULL),
       stackmap_builder_(NULL),
       exception_handlers_list_(NULL),
       try_index_(CatchClauseNode::kInvalidTryIndex),
       context_level_(0) {
   ASSERT(assembler_ != NULL);
   ASSERT(parsed_function.node_sequence() != NULL);
   ASSERT(Isolate::Current()->long_jump_base()->IsSafeToJump());
   pc_descriptors_list_ = new DescriptorList();
   // We do not build any stack maps in the unoptimizing compiler.
-  exception_handlers_list_ = new CodeGenerator::HandlerList();
+  exception_handlers_list_ = new ExceptionHandlerList();
 }
 
 
 bool CodeGenerator::IsResultNeeded(AstNode* node) const {
   return !state()->IsRootNode(node);
 }
 
 
 // NOTE: First 13 bytes of the code may be patched with a jump instruction. Do
 // not emit any objects in the first 13 bytes.
@@ skipping 2580 matching lines @@
   const Error& error = Error::Handle(
       Parser::FormatError(script, token_index, "Error", format, args));
   va_end(args);
   Isolate::Current()->long_jump_base()->Jump(1, error);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64