truffle: src/share/vm/ci/ciField.cpp comparison

comparison src/share/vm/ci/ciField.cpp @ 1339:09ac706c2623

Merge

author	asaha
date	Wed, 24 Mar 2010 17:16:33 -0700
parents	73b22f919c34
children	a8f9f091c219 c18cbe5936b8

comparison

equal deleted inserted replaced

-:f5dd08ad65df
+:09ac706c2623
 /*
-* Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+* Copyright 1999-2009 Sun Microsystems, Inc.  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.
 // field.
 if (field_type == T_OBJECT || field_type == T_ARRAY) {
 bool ignore;
 // This is not really a class reference; the index always refers to the
 // field's type signature, as a symbol.  Linkage checks do not apply.
-_type = ciEnv::current(thread)->get_klass_by_index(klass, sig_index, ignore);
+_type = ciEnv::current(thread)->get_klass_by_index(cpool, sig_index, ignore, klass);
 } else {
 _type = ciType::make(field_type);
 }
 _name = (ciSymbol*)ciEnv::current(thread)->get_object(name());
 // Note: we actually create a ciInstanceKlass for this klass,
 // even though we may not need to.
 int holder_index = cpool->klass_ref_index_at(index);
 bool holder_is_accessible;
 ciInstanceKlass* declared_holder =
-ciEnv::current(thread)->get_klass_by_index(klass, holder_index,
+ciEnv::current(thread)->get_klass_by_index(cpool, holder_index,
-holder_is_accessible)
+holder_is_accessible,
-->as_instance_klass();
+klass)->as_instance_klass();
 // The declared holder of this field may not have been loaded.
 // Bail out with partial field information.
 if (!holder_is_accessible) {
 // _cp_index and _type have already been set.
 // Either (a) it is marked shared, or else (b) we are done bootstrapping.
 assert(is_shared() || ciObjectFactory::is_initialized(),
 "bootstrap classes must not create & cache unshared fields");
 }
+static bool trust_final_non_static_fields(ciInstanceKlass* holder) {
+if (holder == NULL)
+return false;
+if (holder->name() == ciSymbol::java_lang_System())
+// Never trust strangely unstable finals:  System.out, etc.
+return false;
+// Even if general trusting is disabled, trust system-built closures in these packages.
+if (holder->is_in_package("java/dyn") || holder->is_in_package("sun/dyn"))
+return true;
+return TrustFinalNonStaticFields;
+}
 void ciField::initialize_from(fieldDescriptor* fd) {
 // Get the flags, offset, and canonical holder of the field.
 _flags = ciFlags(fd->access_flags());
 _offset = fd->offset();
 _holder = CURRENT_ENV->get_object(fd->field_holder())->as_instance_klass();
 // Check to see if the field is constant.
-if (_holder->is_initialized() &&
+if (_holder->is_initialized() && this->is_final()) {
-this->is_final() && this->is_static()) {
+if (!this->is_static()) {
+// A field can be constant if it's a final static field or if it's
+// a final non-static field of a trusted class ({java,sun}.dyn).
+if (trust_final_non_static_fields(_holder)) {
+_is_constant = true;
+return;
+}
+_is_constant = false;
+return;
+}
 // This field just may be constant.  The only cases where it will
 // not be constant are:
 //
 // 1. The field holds a non-perm-space oop.  The field is, strictly
 //    speaking, constant but we cannot embed non-perm-space oops into
 // 2. The field is a *special* static&final field whose value
 //    may change.  The three examples are java.lang.System.in,
 //    java.lang.System.out, and java.lang.System.err.
 klassOop k = _holder->get_klassOop();
-assert( SystemDictionary::system_klass() != NULL, "Check once per vm");
+assert( SystemDictionary::System_klass() != NULL, "Check once per vm");
-if( k == SystemDictionary::system_klass() ) {
+if( k == SystemDictionary::System_klass() ) {
 // Check offsets for case 2: System.in, System.out, or System.err
 if( _offset == java_lang_System::in_offset_in_bytes()  ||
 _offset == java_lang_System::out_offset_in_bytes() ||
 _offset == java_lang_System::err_offset_in_bytes() ) {
 _is_constant = false;

Mercurial > hg > truffle

comparison src/share/vm/ci/ciField.cpp @ 1339:09ac706c2623