hotspot/src/share/vm/opto/graphKit.cpp

rev 4963 : imported patch stable

*** 3802,3813 ****
    const TypePtr* value_field_type = string_type->add_offset(value_offset);
    const TypeAryPtr*  value_type = TypeAryPtr::make(TypePtr::NotNull,
                                                     TypeAry::make(TypeInt::CHAR,TypeInt::POS),
                                                     ciTypeArrayKlass::make(T_CHAR), true, 0);
    int value_field_idx = C->get_alias_index(value_field_type);
!   return make_load(ctrl, basic_plus_adr(str, str, value_offset),
                     value_type, T_OBJECT, value_field_idx);
  }
  
  void GraphKit::store_String_offset(Node* ctrl, Node* str, Node* value) {
    int offset_offset = java_lang_String::offset_offset_in_bytes();
    const TypeInstPtr* string_type = TypeInstPtr::make(TypePtr::NotNull, C->env()->String_klass(),
--- 3802,3822 ----
    const TypePtr* value_field_type = string_type->add_offset(value_offset);
    const TypeAryPtr*  value_type = TypeAryPtr::make(TypePtr::NotNull,
                                                     TypeAry::make(TypeInt::CHAR,TypeInt::POS),
                                                     ciTypeArrayKlass::make(T_CHAR), true, 0);
    int value_field_idx = C->get_alias_index(value_field_type);
!   Node* load = make_load(ctrl, basic_plus_adr(str, str, value_offset),
                           value_type, T_OBJECT, value_field_idx);
+ 
+   if (UseImplicitStableValues) {
+     // String.value field is known to be @Stable.
+     // Reify the property as a CastPP node in Ideal graph to comply with monotonicity
+     // assumption of CCP analysis.
+     load = _gvn.transform(new (C) CastPPNode(load, value_type->cast_to_stable(true)));
+   }
+ 
+   return load;
  }
  
  void GraphKit::store_String_offset(Node* ctrl, Node* str, Node* value) {
    int offset_offset = java_lang_String::offset_offset_in_bytes();
    const TypeInstPtr* string_type = TypeInstPtr::make(TypePtr::NotNull, C->env()->String_klass(),
*** 3821,3833 ****
  void GraphKit::store_String_value(Node* ctrl, Node* str, Node* value) {
    int value_offset = java_lang_String::value_offset_in_bytes();
    const TypeInstPtr* string_type = TypeInstPtr::make(TypePtr::NotNull, C->env()->String_klass(),
                                                       false, NULL, 0);
    const TypePtr* value_field_type = string_type->add_offset(value_offset);
-   const TypeAryPtr*  value_type = TypeAryPtr::make(TypePtr::NotNull,
-                                                    TypeAry::make(TypeInt::CHAR,TypeInt::POS),
-                                                    ciTypeArrayKlass::make(T_CHAR), true, 0);
    int value_field_idx = C->get_alias_index(value_field_type);
    store_to_memory(ctrl, basic_plus_adr(str, value_offset),
                    value, T_OBJECT, value_field_idx);
  }
  
--- 3830,3839 ----