src/share/vm/oops/constantPool.cpp

rev 12514 : [mq]: tmp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 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.
*** 150,159 ****
--- 150,160 ----
    }
  }
  
  // CDS support. Create a new resolved_references array.
  void ConstantPool::restore_unshareable_info(TRAPS) {
+   assert(is_constantPool(), "ensure C++ vtable is restored");
  
    // Only create the new resolved references array if it hasn't been attempted before
    if (resolved_references() != NULL) return;
  
    // restore the C++ vtable from the shared archive