Mercurial > hg > graal-compiler
comparison src/share/vm/ci/ciField.cpp @ 3464:be4ca325525a
Merge.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Wed, 27 Jul 2011 17:32:44 -0700 |
parents | 0654ee04b214 81d815b05abb |
children | 532be189cf09 |
comparison
equal
deleted
inserted
replaced
3239:7c4b4daac19b | 3464:be4ca325525a |
---|---|
285 ciType* ciField::compute_type() { | 285 ciType* ciField::compute_type() { |
286 GUARDED_VM_ENTRY(return compute_type_impl();) | 286 GUARDED_VM_ENTRY(return compute_type_impl();) |
287 } | 287 } |
288 | 288 |
289 ciType* ciField::compute_type_impl() { | 289 ciType* ciField::compute_type_impl() { |
290 ciKlass* type = CURRENT_ENV->get_klass_by_name_impl(_holder, _signature, false); | 290 ciKlass* type = CURRENT_ENV->get_klass_by_name_impl(_holder, constantPoolHandle(), _signature, false); |
291 if (!type->is_primitive_type() && is_shared()) { | 291 if (!type->is_primitive_type() && is_shared()) { |
292 // We must not cache a pointer to an unshared type, in a shared field. | 292 // We must not cache a pointer to an unshared type, in a shared field. |
293 bool type_is_also_shared = false; | 293 bool type_is_also_shared = false; |
294 if (type->is_type_array_klass()) { | 294 if (type->is_type_array_klass()) { |
295 type_is_also_shared = true; // int[] etc. are explicitly bootstrapped | 295 type_is_also_shared = true; // int[] etc. are explicitly bootstrapped |