Mercurial > hg > graal-jvmci-8
comparison src/share/vm/opto/type.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 | 62c54fcc0a35 |
children | 52b4284cb496 833b0f92429a |
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. |
38 #include "oops/typeArrayKlass.hpp" | 38 #include "oops/typeArrayKlass.hpp" |
39 #include "opto/matcher.hpp" | 39 #include "opto/matcher.hpp" |
40 #include "opto/node.hpp" | 40 #include "opto/node.hpp" |
41 #include "opto/opcodes.hpp" | 41 #include "opto/opcodes.hpp" |
42 #include "opto/type.hpp" | 42 #include "opto/type.hpp" |
43 | |
44 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
43 | 45 |
44 // Portions of code courtesy of Clifford Click | 46 // Portions of code courtesy of Clifford Click |
45 | 47 |
46 // Optimization - Graph Style | 48 // Optimization - Graph Style |
47 | 49 |
840 } | 842 } |
841 | 843 |
842 #ifndef PRODUCT | 844 #ifndef PRODUCT |
843 //------------------------------dump2------------------------------------------ | 845 //------------------------------dump2------------------------------------------ |
844 void Type::dump2( Dict &d, uint depth, outputStream *st ) const { | 846 void Type::dump2( Dict &d, uint depth, outputStream *st ) const { |
845 st->print(_type_info[_base].msg); | 847 st->print("%s", _type_info[_base].msg); |
846 } | 848 } |
847 | 849 |
848 //------------------------------dump------------------------------------------- | 850 //------------------------------dump------------------------------------------- |
849 void Type::dump_on(outputStream *st) const { | 851 void Type::dump_on(outputStream *st) const { |
850 ResourceMark rm; | 852 ResourceMark rm; |