comparison src/share/vm/oops/constantPool.cpp @ 14518:d8041d695d19

Merged with jdk9/dev/hotspot changeset 3812c088b945
author twisti
date Tue, 11 Mar 2014 18:45:59 -0700
parents 096c224171c4 26c3b944dc35
children b51e29501f30 4ca6dc0799b6
comparison
equal deleted inserted replaced
14141:f97c5ec83832 14518:d8041d695d19
1 /* 1 /*
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
80 } 80 }
81 81
82 void ConstantPool::deallocate_contents(ClassLoaderData* loader_data) { 82 void ConstantPool::deallocate_contents(ClassLoaderData* loader_data) {
83 MetadataFactory::free_metadata(loader_data, cache()); 83 MetadataFactory::free_metadata(loader_data, cache());
84 set_cache(NULL); 84 set_cache(NULL);
85 MetadataFactory::free_array<u2>(loader_data, reference_map());
86 set_reference_map(NULL);
87
85 MetadataFactory::free_array<jushort>(loader_data, operands()); 88 MetadataFactory::free_array<jushort>(loader_data, operands());
86 set_operands(NULL); 89 set_operands(NULL);
87 90
88 release_C_heap_structures(); 91 release_C_heap_structures();
89 92
1872 1875
1873 1876
1874 // Printing 1877 // Printing
1875 1878
1876 void ConstantPool::print_on(outputStream* st) const { 1879 void ConstantPool::print_on(outputStream* st) const {
1877 EXCEPTION_MARK;
1878 assert(is_constantPool(), "must be constantPool"); 1880 assert(is_constantPool(), "must be constantPool");
1879 st->print_cr(internal_name()); 1881 st->print_cr(internal_name());
1880 if (flags() != 0) { 1882 if (flags() != 0) {
1881 st->print(" - flags: 0x%x", flags()); 1883 st->print(" - flags: 0x%x", flags());
1882 if (has_preresolution()) st->print(" has_preresolution"); 1884 if (has_preresolution()) st->print(" has_preresolution");