Mercurial > hg > truffle
comparison src/share/vm/oops/klass.cpp @ 8883:b9a918201d47
Merge with hsx25
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Sat, 06 Apr 2013 20:04:06 +0200 |
parents | 5fc51c1ecdeb 1fc4d4768b90 |
children | 836a62f43af9 |
comparison
equal
deleted
inserted
replaced
8660:d47b52b0ff68 | 8883:b9a918201d47 |
---|---|
144 } | 144 } |
145 | 145 |
146 Klass::Klass() { | 146 Klass::Klass() { |
147 Klass* k = this; | 147 Klass* k = this; |
148 | 148 |
149 { // Preinitialize supertype information. | 149 // Preinitialize supertype information. |
150 // A later call to initialize_supers() may update these settings: | 150 // A later call to initialize_supers() may update these settings: |
151 set_super(NULL); | 151 set_super(NULL); |
152 for (juint i = 0; i < Klass::primary_super_limit(); i++) { | 152 for (juint i = 0; i < Klass::primary_super_limit(); i++) { |
153 _primary_supers[i] = NULL; | 153 _primary_supers[i] = NULL; |
154 } | 154 } |
155 set_secondary_supers(NULL); | 155 set_secondary_supers(NULL); |
156 _primary_supers[0] = k; | 156 set_secondary_super_cache(NULL); |
157 set_super_check_offset(in_bytes(primary_supers_offset())); | 157 _primary_supers[0] = k; |
158 } | 158 set_super_check_offset(in_bytes(primary_supers_offset())); |
159 | 159 |
160 set_java_mirror(NULL); | 160 set_java_mirror(NULL); |
161 set_modifier_flags(0); | 161 set_modifier_flags(0); |
162 set_layout_helper(Klass::_lh_neutral_value); | 162 set_layout_helper(Klass::_lh_neutral_value); |
163 set_name(NULL); | 163 set_name(NULL); |
484 void Klass::oops_do(OopClosure* cl) { | 484 void Klass::oops_do(OopClosure* cl) { |
485 cl->do_oop(&_java_mirror); | 485 cl->do_oop(&_java_mirror); |
486 } | 486 } |
487 | 487 |
488 void Klass::remove_unshareable_info() { | 488 void Klass::remove_unshareable_info() { |
489 if (!DumpSharedSpaces) { | |
490 // Clean up after OOM during class loading | |
491 if (class_loader_data() != NULL) { | |
492 class_loader_data()->remove_class(this); | |
493 } | |
494 } | |
489 set_subklass(NULL); | 495 set_subklass(NULL); |
490 set_next_sibling(NULL); | 496 set_next_sibling(NULL); |
491 // Clear the java mirror | 497 // Clear the java mirror |
492 set_java_mirror(NULL); | 498 set_java_mirror(NULL); |
493 set_next_link(NULL); | 499 set_next_link(NULL); |