1.1 --- a/src/share/vm/gc_implementation/g1/g1CardCounts.hpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CardCounts.hpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2013, 2014, 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 @@ -77,10 +77,10 @@
1.11 err_msg("Invalid card pointer: "
1.12 "card_ptr: " PTR_FORMAT ", "
1.13 "_ct_bot: " PTR_FORMAT,
1.14 - card_ptr, _ct_bot));
1.15 + p2i(card_ptr), p2i(_ct_bot)));
1.16 size_t card_num = pointer_delta(card_ptr, _ct_bot, sizeof(jbyte));
1.17 assert(card_num >= 0 && card_num < _committed_max_card_num,
1.18 - err_msg("card pointer out of range: " PTR_FORMAT, card_ptr));
1.19 + err_msg("card pointer out of range: " PTR_FORMAT, p2i(card_ptr)));
1.20 return card_num;
1.21 }
1.22
