Mercurial > hg > graal-jvmci-8
comparison src/share/vm/oops/cpCache.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 | 3205e78d8193 |
children | 0b9500028980 |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1998, 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. |
36 #include "utilities/macros.hpp" | 36 #include "utilities/macros.hpp" |
37 #if INCLUDE_ALL_GCS | 37 #if INCLUDE_ALL_GCS |
38 # include "gc_implementation/parallelScavenge/psPromotionManager.hpp" | 38 # include "gc_implementation/parallelScavenge/psPromotionManager.hpp" |
39 #endif // INCLUDE_ALL_GCS | 39 #endif // INCLUDE_ALL_GCS |
40 | 40 |
41 | 41 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC |
42 // Implememtation of ConstantPoolCacheEntry | 42 |
43 // Implementation of ConstantPoolCacheEntry | |
43 | 44 |
44 void ConstantPoolCacheEntry::initialize_entry(int index) { | 45 void ConstantPoolCacheEntry::initialize_entry(int index) { |
45 assert(0 < index && index < 0x10000, "sanity check"); | 46 assert(0 < index && index < 0x10000, "sanity check"); |
46 _indices = index; | 47 _indices = index; |
47 _f1 = NULL; | 48 _f1 = NULL; |
665 | 666 |
666 // Printing | 667 // Printing |
667 | 668 |
668 void ConstantPoolCache::print_on(outputStream* st) const { | 669 void ConstantPoolCache::print_on(outputStream* st) const { |
669 assert(is_constantPoolCache(), "obj must be constant pool cache"); | 670 assert(is_constantPoolCache(), "obj must be constant pool cache"); |
670 st->print_cr(internal_name()); | 671 st->print_cr("%s", internal_name()); |
671 // print constant pool cache entries | 672 // print constant pool cache entries |
672 for (int i = 0; i < length(); i++) entry_at(i)->print(st, i); | 673 for (int i = 0; i < length(); i++) entry_at(i)->print(st, i); |
673 } | 674 } |
674 | 675 |
675 void ConstantPoolCache::print_value_on(outputStream* st) const { | 676 void ConstantPoolCache::print_value_on(outputStream* st) const { |