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

     1.1 --- a/src/share/vm/opto/library_call.cpp	Wed Oct 06 14:18:32 2010 -0700
     1.2 +++ b/src/share/vm/opto/library_call.cpp	Thu Oct 07 21:40:55 2010 -0700
     1.3 @@ -4761,7 +4761,7 @@
     1.4        Node* cv = generate_checkcast_arraycopy(adr_type,
     1.5                                                dest_elem_klass,
     1.6                                                src, src_offset, dest, dest_offset,
     1.7 -                                              copy_length);
     1.8 +                                              ConvI2X(copy_length));
     1.9        if (cv == NULL)  cv = intcon(-1);  // failure (no stub available)
    1.10        checked_control = control();
    1.11        checked_i_o     = i_o();
    1.12 @@ -5206,7 +5206,7 @@
    1.13    int sco_offset = Klass::super_check_offset_offset_in_bytes() + sizeof(oopDesc);
    1.14    Node* p3 = basic_plus_adr(dest_elem_klass, sco_offset);
    1.15    Node* n3 = new(C, 3) LoadINode(NULL, memory(p3), p3, _gvn.type(p3)->is_ptr());
    1.16 -  Node* check_offset = _gvn.transform(n3);
    1.17 +  Node* check_offset = ConvI2X(_gvn.transform(n3));
    1.18    Node* check_value  = dest_elem_klass;
    1.19  
    1.20    Node* src_start  = array_element_address(src,  src_offset,  T_OBJECT);