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

     1.1 --- a/src/share/vm/c1/c1_Runtime1.cpp	Wed Sep 25 17:47:51 2013 +0200
     1.2 +++ b/src/share/vm/c1/c1_Runtime1.cpp	Thu Sep 26 10:25:02 2013 -0400
     1.3 @@ -1019,7 +1019,7 @@
     1.4                n_copy->set_data((intx) (load_klass()));
     1.5              } else {
     1.6                assert(mirror() != NULL, "klass not set");
     1.7 -              n_copy->set_data((intx) (mirror()));
     1.8 +              n_copy->set_data(cast_from_oop<intx>(mirror()));
     1.9              }
    1.10  
    1.11              if (TracePatching) {
    1.12 @@ -1031,7 +1031,7 @@
    1.13            assert(n_copy->data() == 0 ||
    1.14                   n_copy->data() == (intptr_t)Universe::non_oop_word(),
    1.15                   "illegal init value");
    1.16 -          n_copy->set_data((intx) (appendix()));
    1.17 +          n_copy->set_data(cast_from_oop<intx>(appendix()));
    1.18  
    1.19            if (TracePatching) {
    1.20              Disassembler::decode(copy_buff, copy_buff + *byte_count, tty);