src/hotspot/share/jvmci/jvmciEnv.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1999, 2017, 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, 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.
*** 148,158 ****
    }
  
    if (found_klass == NULL && !cpool.is_null() && cpool->has_preresolution()) {
      // Look inside the constant pool for pre-resolved class entries.
      for (int i = cpool->length() - 1; i >= 1; i--) {
!       if (cpool->tag_at(i).is_klass() || cpool->tag_at(i).is_value_type()) {
          Klass*  kls = cpool->resolved_klass_at(i);
          if (kls->name() == sym) {
            return kls;
          }
        }
--- 148,158 ----
    }
  
    if (found_klass == NULL && !cpool.is_null() && cpool->has_preresolution()) {
      // Look inside the constant pool for pre-resolved class entries.
      for (int i = cpool->length() - 1; i >= 1; i--) {
!       if (cpool->tag_at(i).is_klass()) {
          Klass*  kls = cpool->resolved_klass_at(i);
          if (kls->name() == sym) {
            return kls;
          }
        }