Mercurial > hg > graal-compiler
comparison src/share/vm/memory/generation.cpp @ 17937:78bbf4d43a14
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 | 86e6d691f2e1 |
children | 30c99d8e0f02 |
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. |
40 #include "memory/space.inline.hpp" | 40 #include "memory/space.inline.hpp" |
41 #include "oops/oop.inline.hpp" | 41 #include "oops/oop.inline.hpp" |
42 #include "runtime/java.hpp" | 42 #include "runtime/java.hpp" |
43 #include "utilities/copy.hpp" | 43 #include "utilities/copy.hpp" |
44 #include "utilities/events.hpp" | 44 #include "utilities/events.hpp" |
45 | |
46 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
45 | 47 |
46 Generation::Generation(ReservedSpace rs, size_t initial_size, int level) : | 48 Generation::Generation(ReservedSpace rs, size_t initial_size, int level) : |
47 _level(level), | 49 _level(level), |
48 _ref_processor(NULL) { | 50 _ref_processor(NULL) { |
49 if (!_virtual_space.initialize(rs, initial_size)) { | 51 if (!_virtual_space.initialize(rs, initial_size)) { |