src/share/vm/classfile/bytecodeAssembler.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 2014, 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) 2012, 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.
*** 62,73 ****
        case BytecodeCPEntry::UTF8:
          entry._u.utf8->increment_refcount();
          cp->symbol_at_put(idx, entry._u.utf8);
          break;
        case BytecodeCPEntry::KLASS:
!         cp->unresolved_klass_at_put(
!             idx, cp->symbol_at(entry._u.klass));
          break;
        case BytecodeCPEntry::STRING:
          cp->unresolved_string_at_put(
              idx, cp->symbol_at(entry._u.string));
          break;
--- 62,73 ----
        case BytecodeCPEntry::UTF8:
          entry._u.utf8->increment_refcount();
          cp->symbol_at_put(idx, entry._u.utf8);
          break;
        case BytecodeCPEntry::KLASS:
!         cp->klass_index_at_put(
!             idx, entry._u.klass);
          break;
        case BytecodeCPEntry::STRING:
          cp->unresolved_string_at_put(
              idx, cp->symbol_at(entry._u.string));
          break;
*** 83,92 ****
--- 83,95 ----
          break;
        default:
          ShouldNotReachHere();
      }
    }
+ 
+   cp->initialize_unresolved_klasses(_orig->pool_holder()->class_loader_data(),
+                                     CHECK_NULL);
    return cp;
  }
  
  void BytecodeAssembler::append(u1 imm_u1) {
    _code->append(imm_u1);