jdk-sandbox: comparison hotspot/src/share/vm/opto/compile.cpp

equal deleted inserted replaced

-:693c6b883b54
+:8c1e3dd5fe1b
 /*
-* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2011, Oracle and/or its affiliates. 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.
 }
 // Oop pointers need some flattening
 const TypeInstPtr *to = tj->isa_instptr();
 if( to && _AliasLevel >= 2 && to != TypeOopPtr::BOTTOM ) {
+ciInstanceKlass *k = to->klass()->as_instance_klass();
 if( ptr == TypePtr::Constant ) {
-// No constant oop pointers (such as Strings); they alias with
+if (to->klass() != ciEnv::current()->Class_klass() ||
-// unknown strings.
+offset < k->size_helper() * wordSize) {
-assert(!is_known_inst, "not scalarizable allocation");
+// No constant oop pointers (such as Strings); they alias with
-tj = to = TypeInstPtr::make(TypePtr::BotPTR,to->klass(),false,0,offset);
+// unknown strings.
+assert(!is_known_inst, "not scalarizable allocation");
+tj = to = TypeInstPtr::make(TypePtr::BotPTR,to->klass(),false,0,offset);
+}
 } else if( is_known_inst ) {
 tj = to; // Keep NotNull and klass_is_exact for instance type
 } else if( ptr == TypePtr::NotNull || to->klass_is_exact() ) {
 // During the 2nd round of IterGVN, NotNull castings are removed.
 // Make sure the Bottom and NotNull variants alias the same.
 // Also, make sure exact and non-exact variants alias the same.
 tj = to = TypeInstPtr::make(TypePtr::BotPTR,to->klass(),false,0,offset);
 }
 // Canonicalize the holder of this field
-ciInstanceKlass *k = to->klass()->as_instance_klass();
 if (offset >= 0 && offset < instanceOopDesc::base_offset_in_bytes()) {
 // First handle header references such as a LoadKlassNode, even if the
 // object's klass is unloaded at compile time (4965979).
 if (!is_known_inst) { // Do it only for non-instance types
 tj = to = TypeInstPtr::make(TypePtr::BotPTR, env()->Object_klass(), false, NULL, offset);
 }
 } else if (offset < 0 || offset >= k->size_helper() * wordSize) {
-to = NULL;
+// Static fields are in the space above the normal instance
-tj = TypeOopPtr::BOTTOM;
+// fields in the java.lang.Class instance.
-offset = tj->offset();
+if (to->klass() != ciEnv::current()->Class_klass()) {
+to = NULL;
+tj = TypeOopPtr::BOTTOM;
+offset = tj->offset();
+}
 } else {
 ciInstanceKlass *canonical_holder = k->get_canonical_holder(offset);
 if (!k->equals(canonical_holder) || tj->offset() != offset) {
 if( is_known_inst ) {
 tj = to = TypeInstPtr::make(to->ptr(), canonical_holder, true, NULL, offset, to->instance_id());
 for (int i = 0; i < new_ats; i++)  _alias_types[old_ats+i] = &ats[i];
 }
 //--------------------------------find_alias_type------------------------------
-Compile::AliasType* Compile::find_alias_type(const TypePtr* adr_type, bool no_create) {
+Compile::AliasType* Compile::find_alias_type(const TypePtr* adr_type, bool no_create, ciField* original_field) {
 if (_AliasLevel == 0)
 return alias_type(AliasIdxBot);
 AliasCacheEntry* ace = probe_alias_cache(adr_type);
 if (ace->_adr_type == adr_type) {
 }
 // %%% (We would like to finalize JavaThread::threadObj_offset(),
 // but the base pointer type is not distinctive enough to identify
 // references into JavaThread.)
-// Check for final instance fields.
+// Check for final fields.
 const TypeInstPtr* tinst = flat->isa_instptr();
 if (tinst && tinst->offset() >= instanceOopDesc::base_offset_in_bytes()) {
-ciInstanceKlass *k = tinst->klass()->as_instance_klass();
+ciField* field;
-ciField* field = k->get_field_by_offset(tinst->offset(), false);
+if (tinst->const_oop() != NULL &&
+tinst->klass() == ciEnv::current()->Class_klass() &&
+tinst->offset() >= (tinst->klass()->as_instance_klass()->size_helper() * wordSize)) {
+// static field
+ciInstanceKlass* k = tinst->const_oop()->as_instance()->java_lang_Class_klass()->as_instance_klass();
+field = k->get_field_by_offset(tinst->offset(), true);
+} else {
+ciInstanceKlass *k = tinst->klass()->as_instance_klass();
+field = k->get_field_by_offset(tinst->offset(), false);
+}
+assert(field == NULL ||
+original_field == NULL ||
+(field->holder() == original_field->holder() &&
+field->offset() == original_field->offset() &&
+field->is_static() == original_field->is_static()), "wrong field?");
 // Set field() and is_rewritable() attributes.
 if (field != NULL)  alias_type(idx)->set_field(field);
-}
-const TypeKlassPtr* tklass = flat->isa_klassptr();
-// Check for final static fields.
-if (tklass && tklass->klass()->is_instance_klass()) {
-ciInstanceKlass *k = tklass->klass()->as_instance_klass();
-ciField* field = k->get_field_by_offset(tklass->offset(), true);
-// Set field() and is_rewritable() attributes.
-if (field != NULL)   alias_type(idx)->set_field(field);
 }
 }
 // Fill the cache for next time.
 ace->_adr_type = adr_type;
 Compile::AliasType* Compile::alias_type(ciField* field) {
 const TypeOopPtr* t;
 if (field->is_static())
-t = TypeKlassPtr::make(field->holder());
+t = TypeInstPtr::make(field->holder()->java_mirror());
 else
 t = TypeOopPtr::make_from_klass_raw(field->holder());
-AliasType* atp = alias_type(t->add_offset(field->offset_in_bytes()));
+AliasType* atp = alias_type(t->add_offset(field->offset_in_bytes()), field);
 assert(field->is_final() == !atp->is_rewritable(), "must get the rewritable bits correct");
 return atp;
 }
 // Handle special cases.
 if (adr_type == NULL)             return true;
 if (adr_type == TypePtr::BOTTOM)  return true;
-return find_alias_type(adr_type, true) != NULL;
+return find_alias_type(adr_type, true, NULL) != NULL;
 }
 //-----------------------------must_alias--------------------------------------
 // True if all values of the given address type are in the given alias category.
 bool Compile::must_alias(const TypePtr* adr_type, int alias_idx) {

changeset 8725	8c1e3dd5fe1b
parent 8107	78e5bd944384
child 9175	80221fe09772
child 8868	1bae515b806b