*** old/src/cpu/sparc/vm/stubGenerator_sparc.cpp	Thu Feb  5 10:54:00 2015
--- new/src/cpu/sparc/vm/stubGenerator_sparc.cpp	Thu Feb  5 10:53:59 2015

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 955,965 ****
--- 955,964 ----
    //  The input registers are overwritten.
    //
    void gen_write_ref_array_pre_barrier(Register addr, Register count, bool dest_uninitialized) {
      BarrierSet* bs = Universe::heap()->barrier_set();
      switch (bs->kind()) {
        case BarrierSet::G1SATBCT:
        case BarrierSet::G1SATBCTLogging:
          // With G1, don't generate the call if we statically know that the target in uninitialized
          if (!dest_uninitialized) {
            __ save_frame(0);
            // Save the necessary global regs... will be used after.

*** 1003,1013 ****
--- 1002,1011 ----
    void gen_write_ref_array_post_barrier(Register addr, Register count,
                                          Register tmp) {
      BarrierSet* bs = Universe::heap()->barrier_set();
  
      switch (bs->kind()) {
        case BarrierSet::G1SATBCT:
        case BarrierSet::G1SATBCTLogging:
          {
            // Get some new fresh output registers.
            __ save_frame(0);
            __ mov(addr->after_save(), O0);