src/share/vm/c1/c1_ValueMap.cpp

rev 10540 : imported patch c1_ValueMap
rev 10548 : imported patch some fixes
rev 10556 : imported patch update dates

*** 1,7 ****
  /*
!  * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 44,64 ****
  #endif
  
  
  ValueMap::ValueMap()
    : _nesting(0)
!   , _entries(ValueMapInitialSize, NULL)
    , _killed_values()
    , _entry_count(0)
  {
    NOT_PRODUCT(reset_statistics());
  }
  
  
  ValueMap::ValueMap(ValueMap* old)
    : _nesting(old->_nesting + 1)
!   , _entries(old->_entries.length())
    , _killed_values()
    , _entry_count(old->_entry_count)
  {
    for (int i = size() - 1; i >= 0; i--) {
      _entries.at_put(i, old->entry_at(i));
--- 44,64 ----
  #endif
  
  
  ValueMap::ValueMap()
    : _nesting(0)
!   , _entries(ValueMapInitialSize, ValueMapInitialSize, NULL)
    , _killed_values()
    , _entry_count(0)
  {
    NOT_PRODUCT(reset_statistics());
  }
  
  
  ValueMap::ValueMap(ValueMap* old)
    : _nesting(old->_nesting + 1)
!   , _entries(old->_entries.length(), old->_entries.length(), NULL)
    , _killed_values()
    , _entry_count(old->_entry_count)
  {
    for (int i = size() - 1; i >= 0; i--) {
      _entries.at_put(i, old->entry_at(i));
*** 70,80 ****
  void ValueMap::increase_table_size() {
    int old_size = size();
    int new_size = old_size * 2 + 1;
  
    ValueMapEntryList worklist(8);
!   ValueMapEntryArray new_entries(new_size, NULL);
    int new_entry_count = 0;
  
    TRACE_VALUE_NUMBERING(tty->print_cr("increasing table size from %d to %d", old_size, new_size));
  
    for (int i = old_size - 1; i >= 0; i--) {
--- 70,80 ----
  void ValueMap::increase_table_size() {
    int old_size = size();
    int new_size = old_size * 2 + 1;
  
    ValueMapEntryList worklist(8);
!   ValueMapEntryArray new_entries(new_size, new_size, NULL);
    int new_entry_count = 0;
  
    TRACE_VALUE_NUMBERING(tty->print_cr("increasing table size from %d to %d", old_size, new_size));
  
    for (int i = old_size - 1; i >= 0; i--) {
*** 484,494 ****
  }
  
  
  GlobalValueNumbering::GlobalValueNumbering(IR* ir)
    : _current_map(NULL)
!   , _value_maps(ir->linear_scan_order()->length(), NULL)
    , _compilation(ir->compilation())
  {
    TRACE_VALUE_NUMBERING(tty->print_cr("****** start of global value numbering"));
  
    ShortLoopOptimizer short_loop_optimizer(this);
--- 484,494 ----
  }
  
  
  GlobalValueNumbering::GlobalValueNumbering(IR* ir)
    : _current_map(NULL)
!   , _value_maps(ir->linear_scan_order()->length(), ir->linear_scan_order()->length(), NULL)
    , _compilation(ir->compilation())
  {
    TRACE_VALUE_NUMBERING(tty->print_cr("****** start of global value numbering"));
  
    ShortLoopOptimizer short_loop_optimizer(this);