Mercurial > hg > truffle

comparison src/share/vm/oops/constantPool.cpp @ 17891:b6a2ba7d3ea7 hs25.20-b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Thu, 17 Apr 2014 16:09:07 -0700
parents 9428a0b94204
children 78bbf4d43a14
comparison
equal deleted inserted replaced
17862:70dc2c030c69 17891:b6a2ba7d3ea7
141 } 141 }
142 } 142 }
143 143
144 // CDS support. Create a new resolved_references array. 144 // CDS support. Create a new resolved_references array.
145 void ConstantPool::restore_unshareable_info(TRAPS) { 145 void ConstantPool::restore_unshareable_info(TRAPS) {
146
147 // Only create the new resolved references array and lock if it hasn't been
148 // attempted before
149 if (resolved_references() != NULL) return;
146 150
147 // restore the C++ vtable from the shared archive 151 // restore the C++ vtable from the shared archive
148 restore_vtable(); 152 restore_vtable();
149 153
150 if (SystemDictionary::Object_klass_loaded()) { 154 if (SystemDictionary::Object_klass_loaded()) {