Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp	Fri Sep 06 11:11:19 2013 -0700
     1.2 +++ b/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp	Mon Aug 12 17:37:02 2013 +0200
     1.3 @@ -105,7 +105,7 @@
     1.4          if (src->is_address() && !src->is_stack() && (src->type() == T_OBJECT || src->type() == T_ARRAY)) return false;
     1.5        }
     1.6  
     1.7 -      if (UseCompressedKlassPointers) {
     1.8 +      if (UseCompressedClassPointers) {
     1.9          if (src->is_address() && !src->is_stack() && src->type() == T_ADDRESS &&
    1.10              src->as_address_ptr()->disp() == oopDesc::klass_offset_in_bytes()) return false;
    1.11        }
    1.12 @@ -963,7 +963,7 @@
    1.13        case T_METADATA:  __ ld_ptr(base, offset, to_reg->as_register()); break;
    1.14        case T_ADDRESS:
    1.15  #ifdef _LP64
    1.16 -        if (offset == oopDesc::klass_offset_in_bytes() && UseCompressedKlassPointers) {
    1.17 +        if (offset == oopDesc::klass_offset_in_bytes() && UseCompressedClassPointers) {
    1.18            __ lduw(base, offset, to_reg->as_register());
    1.19            __ decode_klass_not_null(to_reg->as_register());
    1.20          } else
    1.21 @@ -2208,7 +2208,7 @@
    1.22      // We don't know the array types are compatible
    1.23      if (basic_type != T_OBJECT) {
    1.24        // Simple test for basic type arrays
    1.25 -      if (UseCompressedKlassPointers) {
    1.26 +      if (UseCompressedClassPointers) {
    1.27          // We don't need decode because we just need to compare
    1.28          __ lduw(src, oopDesc::klass_offset_in_bytes(), tmp);
    1.29          __ lduw(dst, oopDesc::klass_offset_in_bytes(), tmp2);
    1.30 @@ -2342,7 +2342,7 @@
    1.31      // but not necessarily exactly of type default_type.
    1.32      Label known_ok, halt;
    1.33      metadata2reg(op->expected_type()->constant_encoding(), tmp);
    1.34 -    if (UseCompressedKlassPointers) {
    1.35 +    if (UseCompressedClassPointers) {
    1.36        // tmp holds the default type. It currently comes uncompressed after the
    1.37        // load of a constant, so encode it.
    1.38        __ encode_klass_not_null(tmp);