1.1 --- a/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2000, 2012, 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 @@ -88,9 +88,8 @@
1.11 oop new_obj = oop(obj->mark()->decode_pointer());
1.12 assert(new_obj != NULL || // is forwarding ptr?
1.13 obj->mark() == markOopDesc::prototype() || // not gc marked?
1.14 - (UseBiasedLocking && obj->mark()->has_bias_pattern()) ||
1.15 + (UseBiasedLocking && obj->mark()->has_bias_pattern()),
1.16 // not gc marked?
1.17 - obj->is_shared(), // never forwarded?
1.18 "should be forwarded");
1.19 if (new_obj != NULL) {
1.20 assert(Universe::heap()->is_in_reserved(new_obj),
