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

     1.1 --- a/src/cpu/sparc/vm/nativeInst_sparc.cpp	Wed Sep 25 17:47:51 2013 +0200
     1.2 +++ b/src/cpu/sparc/vm/nativeInst_sparc.cpp	Thu Sep 26 10:25:02 2013 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -358,7 +358,7 @@
    1.11          oop_Relocation *r = iter.oop_reloc();
    1.12          if (oop_addr == NULL) {
    1.13            oop_addr = r->oop_addr();
    1.14 -          *oop_addr = (oop)x;
    1.15 +          *oop_addr = cast_to_oop(x);
    1.16          } else {
    1.17            assert(oop_addr == r->oop_addr(), "must be only one set-oop here");
    1.18          }
    1.19 @@ -478,7 +478,7 @@
    1.20          oop_Relocation *r = iter.oop_reloc();
    1.21          if (oop_addr == NULL) {
    1.22            oop_addr = r->oop_addr();
    1.23 -          *oop_addr = (oop)x;
    1.24 +          *oop_addr = cast_to_oop(x);
    1.25          } else {
    1.26            assert(oop_addr == r->oop_addr(), "must be only one set-oop here");
    1.27          }