*** old/src/cpu/x86/vm/stubGenerator_x86_32.cpp	Thu Feb  5 10:54:02 2015
--- new/src/cpu/x86/vm/stubGenerator_x86_32.cpp	Thu Feb  5 10:54:02 2015

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1999, 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.

*** 704,714 ****
--- 704,713 ----
    //     count   -  element count
    void  gen_write_ref_array_pre_barrier(Register start, Register count, bool uninitialized_target) {
      assert_different_registers(start, count);
      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 (!uninitialized_target) {
             __ pusha();                      // push registers
             __ call_VM_leaf(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_pre),

*** 737,747 ****
--- 736,745 ----
    //
    void  gen_write_ref_array_post_barrier(Register start, Register count) {
      BarrierSet* bs = Universe::heap()->barrier_set();
      assert_different_registers(start, count);
      switch (bs->kind()) {
        case BarrierSet::G1SATBCT:
        case BarrierSet::G1SATBCTLogging:
          {
            __ pusha();                      // push registers
            __ call_VM_leaf(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_post),
                            start, count);