< prev index next >

src/hotspot/share/oops/constantPool.cpp

Test failure for 8194741

*** 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. --- 1,7 ---- /* ! * Copyright (c) 1997, 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. ***************
*** 325,341 **** restore_vtable(); if (SystemDictionary::Object_klass_loaded()) { ClassLoaderData* loader_data = pool_holder()->class_loader_data(); #if INCLUDE_CDS_JAVA_HEAP ! if (MetaspaceShared::open_archive_heap_region_mapped()) { oop archived = _cache->archived_references(); ! if (archived != NULL) { ! // Create handle for the archived resolved reference array object ! Handle refs_handle(THREAD, archived); ! set_resolved_references(loader_data->add_handle(refs_handle)); ! } } else #endif { // No mapped archived resolved reference array // Recreate the object array and add to ClassLoaderData. --- 325,340 ---- restore_vtable(); if (SystemDictionary::Object_klass_loaded()) { ClassLoaderData* loader_data = pool_holder()->class_loader_data(); #if INCLUDE_CDS_JAVA_HEAP ! if (MetaspaceShared::open_archive_heap_region_mapped() && ! _cache->archived_references() != NULL) { oop archived = _cache->archived_references(); ! // Create handle for the archived resolved reference array object ! Handle refs_handle(THREAD, archived); ! set_resolved_references(loader_data->add_handle(refs_handle)); } else #endif { // No mapped archived resolved reference array // Recreate the object array and add to ClassLoaderData.
< prev index next >