src/hotspot/share/opto/macro.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2005, 2018, 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) 2005, 2019, 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.
*** 789,799 ****
          offset = array_base + j * (intptr_t)element_size;
        }
  
        const Type *field_type;
        // The next code is taken from Parse::do_get_xxx().
!       if (basic_elem_type == T_OBJECT || basic_elem_type == T_ARRAY) {
          if (!elem_type->is_loaded()) {
            field_type = TypeInstPtr::BOTTOM;
          } else if (field != NULL && field->is_static_constant()) {
            // This can happen if the constant oop is non-perm.
            ciObject* con = field->constant_value().as_object();
--- 789,799 ----
          offset = array_base + j * (intptr_t)element_size;
        }
  
        const Type *field_type;
        // The next code is taken from Parse::do_get_xxx().
!       if (is_reference_type(basic_elem_type)) {
          if (!elem_type->is_loaded()) {
            field_type = TypeInstPtr::BOTTOM;
          } else if (field != NULL && field->is_static_constant()) {
            // This can happen if the constant oop is non-perm.
            ciObject* con = field->constant_value().as_object();