*** old/src/share/vm/opto/graphKit.cpp	Wed Jan 28 17:53:28 2015
--- new/src/share/vm/opto/graphKit.cpp	Wed Jan 28 17:53:28 2015

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

*** 1526,1536 ****
--- 1526,1535 ----
      case BarrierSet::CardTableModRef:
      case BarrierSet::CardTableExtension:
      case BarrierSet::ModRef:
        break;
  
      case BarrierSet::Other:
      default      :
        ShouldNotReachHere();
  
    }
  }

*** 1545,1555 ****
--- 1544,1553 ----
      case BarrierSet::CardTableModRef:
      case BarrierSet::CardTableExtension:
      case BarrierSet::ModRef:
        return true; // There is no pre-barrier
  
      case BarrierSet::Other:
      default      :
        ShouldNotReachHere();
    }
    return false;
  }

*** 1576,1586 ****
--- 1574,1583 ----
        break;
  
      case BarrierSet::ModRef:
        break;
  
      case BarrierSet::Other:
      default      :
        ShouldNotReachHere();
  
    }
  }