src/hotspot/share/interpreter/rewriter.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 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) 1998, 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.
*** 26,36 ****
  #include "gc/shared/gcLocker.hpp"
  #include "interpreter/bytecodes.hpp"
  #include "interpreter/interpreter.hpp"
  #include "interpreter/rewriter.hpp"
  #include "memory/metadataFactory.hpp"
- #include "memory/metaspaceShared.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/generateOopMap.hpp"
  #include "prims/methodHandles.hpp"
  
  // Computes a CPC map (new_index -> original_index) for constant pool entries
--- 26,35 ----
*** 554,564 ****
    patch_invokedynamic_bytecodes();
  }
  
  void Rewriter::rewrite(InstanceKlass* klass, TRAPS) {
    if (!DumpSharedSpaces) {
!     assert(!MetaspaceShared::is_in_shared_space(klass), "archive methods must not be rewritten at run time");
    }
    ResourceMark rm(THREAD);
    Rewriter     rw(klass, klass->constants(), klass->methods(), CHECK);
    // (That's all, folks.)
  }
--- 553,563 ----
    patch_invokedynamic_bytecodes();
  }
  
  void Rewriter::rewrite(InstanceKlass* klass, TRAPS) {
    if (!DumpSharedSpaces) {
!     assert(!klass->is_shared(), "archive methods must not be rewritten at run time");
    }
    ResourceMark rm(THREAD);
    Rewriter     rw(klass, klass->constants(), klass->methods(), CHECK);
    // (That's all, folks.)
  }