--- old/src/cpu/sparc/vm/macroAssembler_sparc.cpp 2015-02-05 10:53:59.090528876 -0500 +++ new/src/cpu/sparc/vm/macroAssembler_sparc.cpp 2015-02-05 10:53:58.666504093 -0500 @@ -1,5 +1,5 @@ /* - * 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 @@ -3869,8 +3869,7 @@ if (new_val == G0) return; G1SATBCardTableModRefBS* bs = (G1SATBCardTableModRefBS*) Universe::heap()->barrier_set(); - assert(bs->kind() == BarrierSet::G1SATBCT || - bs->kind() == BarrierSet::G1SATBCTLogging, "wrong barrier"); + assert(bs->kind() == BarrierSet::G1SATBCTLogging, "wrong barrier"); if (G1RSBarrierRegionFilter) { xor3(store_addr, new_val, tmp);