Mercurial > hg > truffle

comparison src/share/vm/memory/universe.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 9c3dc501b5eb
children 52b4284cb496 6e0cb14ce59b
comparison
equal deleted inserted replaced
17935:7384f6a12fc1 17937:78bbf4d43a14
1 /* 1 /*
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 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.
76 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" 76 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
77 #include "gc_implementation/g1/g1CollectorPolicy.hpp" 77 #include "gc_implementation/g1/g1CollectorPolicy.hpp"
78 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" 78 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
79 #endif // INCLUDE_ALL_GCS 79 #endif // INCLUDE_ALL_GCS
80 80
81 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
82
81 // Known objects 83 // Known objects
82 Klass* Universe::_boolArrayKlassObj = NULL; 84 Klass* Universe::_boolArrayKlassObj = NULL;
83 Klass* Universe::_byteArrayKlassObj = NULL; 85 Klass* Universe::_byteArrayKlassObj = NULL;
84 Klass* Universe::_charArrayKlassObj = NULL; 86 Klass* Universe::_charArrayKlassObj = NULL;
85 Klass* Universe::_intArrayKlassObj = NULL; 87 Klass* Universe::_intArrayKlassObj = NULL;
1346 1348
1347 ResourceMark rm; 1349 ResourceMark rm;
1348 HandleMark hm; // Handles created during verification can be zapped 1350 HandleMark hm; // Handles created during verification can be zapped
1349 _verify_count++; 1351 _verify_count++;
1350 1352
1351 if (!silent) gclog_or_tty->print(prefix); 1353 if (!silent) gclog_or_tty->print("%s", prefix);
1352 if (!silent) gclog_or_tty->print("[Verifying "); 1354 if (!silent) gclog_or_tty->print("[Verifying ");
1353 if (!silent) gclog_or_tty->print("threads "); 1355 if (!silent) gclog_or_tty->print("threads ");
1354 Threads::verify(); 1356 Threads::verify();
1355 if (!silent) gclog_or_tty->print("heap "); 1357 if (!silent) gclog_or_tty->print("heap ");
1356 heap()->verify(silent, option); 1358 heap()->verify(silent, option);