Mercurial > hg > truffle

comparison src/share/vm/gc_implementation/g1/g1AllocRegion.cpp @ 17937:78bbf4d43a14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8037816: Fix for 8036122 breaks build with Xcode5/clang 8043029: Change 8037816 breaks HS build with older GCC versions which don't support diagnostic pragmas 8043164: Format warning in traceStream.hpp Summary: Backport of main fix + two corrections, enables clang compilation, turns on format attributes, corrects/mutes warnings Reviewed-by: kvn, coleenp, iveresov, twisti
author drchase
date Thu, 22 May 2014 15:52:41 -0400
parents 720b6a76dd9d
children ce8f6bb717c9
comparison
equal deleted inserted replaced
17935:7384f6a12fc1 17937:78bbf4d43a14
1 /* 1 /*
2 * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
140 } 140 }
141 141
142 void G1AllocRegion::fill_in_ext_msg(ar_ext_msg* msg, const char* message) { 142 void G1AllocRegion::fill_in_ext_msg(ar_ext_msg* msg, const char* message) {
143 msg->append("[%s] %s c: %u b: %s r: "PTR_FORMAT" u: "SIZE_FORMAT, 143 msg->append("[%s] %s c: %u b: %s r: "PTR_FORMAT" u: "SIZE_FORMAT,
144 _name, message, _count, BOOL_TO_STR(_bot_updates), 144 _name, message, _count, BOOL_TO_STR(_bot_updates),
145 _alloc_region, _used_bytes_before); 145 p2i(_alloc_region), _used_bytes_before);
146 } 146 }
147 147
148 void G1AllocRegion::init() { 148 void G1AllocRegion::init() {
149 trace("initializing"); 149 trace("initializing");
150 assert(_alloc_region == NULL && _used_bytes_before == 0, 150 assert(_alloc_region == NULL && _used_bytes_before == 0,