Mercurial > hg > graal-jvmci-8
diff src/share/vm/prims/jvmtiRedefineClasses.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 | d7773b29c65a |
| children | 52b4284cb496 50054b63f0aa |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiRedefineClasses.cpp Thu May 15 18:23:26 2014 -0400 +++ b/src/share/vm/prims/jvmtiRedefineClasses.cpp Thu May 22 15:52:41 2014 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,6 +43,7 @@ #include "runtime/relocator.hpp" #include "utilities/bitMap.inline.hpp" +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC Array<Method*>* VM_RedefineClasses::_old_methods = NULL; Array<Method*>* VM_RedefineClasses::_new_methods = NULL; @@ -1904,6 +1905,8 @@ // annotations_typeArray if needed. Returns the original constant // pool reference if a rewrite was not needed or the new constant // pool reference if a rewrite was needed. +PRAGMA_DIAG_PUSH +PRAGMA_FORMAT_NONLITERAL_IGNORED u2 VM_RedefineClasses::rewrite_cp_ref_in_annotation_data( AnnotationArray* annotations_typeArray, int &byte_i_ref, const char * trace_mesg, TRAPS) { @@ -1920,6 +1923,7 @@ byte_i_ref += 2; return old_cp_index; } +PRAGMA_DIAG_POP // Rewrite constant pool references in the element_value portion of an