Mercurial > hg > truffle
comparison src/share/vm/services/memSnapshot.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 | c18152e0554e |
children |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2012, 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. |
28 #include "services/memBaseline.hpp" | 28 #include "services/memBaseline.hpp" |
29 #include "services/memPtr.hpp" | 29 #include "services/memPtr.hpp" |
30 #include "services/memPtrArray.hpp" | 30 #include "services/memPtrArray.hpp" |
31 #include "services/memSnapshot.hpp" | 31 #include "services/memSnapshot.hpp" |
32 #include "services/memTracker.hpp" | 32 #include "services/memTracker.hpp" |
33 | |
34 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
33 | 35 |
34 #ifdef ASSERT | 36 #ifdef ASSERT |
35 | 37 |
36 void decode_pointer_record(MemPointerRecord* rec) { | 38 void decode_pointer_record(MemPointerRecord* rec) { |
37 tty->print("Pointer: [" PTR_FORMAT " - " PTR_FORMAT "] size = %d bytes", rec->addr(), | 39 tty->print("Pointer: [" PTR_FORMAT " - " PTR_FORMAT "] size = %d bytes", rec->addr(), |
731 if (ex->pc() != NULL) { | 733 if (ex->pc() != NULL) { |
732 char buf[1024]; | 734 char buf[1024]; |
733 if (os::dll_address_to_function_name(ex->pc(), buf, sizeof(buf), NULL)) { | 735 if (os::dll_address_to_function_name(ex->pc(), buf, sizeof(buf), NULL)) { |
734 tty->print_cr("\t%s", buf); | 736 tty->print_cr("\t%s", buf); |
735 } else { | 737 } else { |
736 tty->print_cr(""); | 738 tty->cr(); |
737 } | 739 } |
738 } | 740 } |
739 } | 741 } |
740 | 742 |
741 ptr = (VMMemRegion*)itr.next(); | 743 ptr = (VMMemRegion*)itr.next(); |