src/share/vm/classfile/classFileError.cpp

Thu, 22 May 2014 15:52:41 -0400

author
drchase
date
Thu, 22 May 2014 15:52:41 -0400
changeset 6680
78bbf4d43a14
parent 2708
1d1603768966
child 6876
710a3c8b516e
child 8761
4c3cae5323bb
permissions
-rw-r--r--

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

duke@435 1 /*
drchase@6680 2 * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
duke@435 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
duke@435 4 *
duke@435 5 * This code is free software; you can redistribute it and/or modify it
duke@435 6 * under the terms of the GNU General Public License version 2 only, as
duke@435 7 * published by the Free Software Foundation.
duke@435 8 *
duke@435 9 * This code is distributed in the hope that it will be useful, but WITHOUT
duke@435 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
duke@435 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
duke@435 12 * version 2 for more details (a copy is included in the LICENSE file that
duke@435 13 * accompanied this code).
duke@435 14 *
duke@435 15 * You should have received a copy of the GNU General Public License version
duke@435 16 * 2 along with this work; if not, write to the Free Software Foundation,
duke@435 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
duke@435 18 *
trims@1907 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
trims@1907 20 * or visit www.oracle.com if you need additional information or have any
trims@1907 21 * questions.
duke@435 22 *
duke@435 23 */
duke@435 24
stefank@2314 25 #include "precompiled.hpp"
stefank@2314 26 #include "classfile/classFileParser.hpp"
stefank@2314 27 #include "classfile/stackMapTable.hpp"
stefank@2314 28 #include "classfile/verifier.hpp"
duke@435 29
duke@435 30 // Keep these in a separate file to prevent inlining
duke@435 31
drchase@6680 32 PRAGMA_DIAG_PUSH
drchase@6680 33 PRAGMA_FORMAT_NONLITERAL_IGNORED
drchase@6680 34
duke@435 35 void ClassFileParser::classfile_parse_error(const char* msg, TRAPS) {
duke@435 36 ResourceMark rm(THREAD);
coleenp@2497 37 Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_ClassFormatError(),
duke@435 38 msg, _class_name->as_C_string());
duke@435 39 }
duke@435 40
duke@435 41 void ClassFileParser::classfile_parse_error(const char* msg, int index, TRAPS) {
duke@435 42 ResourceMark rm(THREAD);
coleenp@2497 43 Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_ClassFormatError(),
duke@435 44 msg, index, _class_name->as_C_string());
duke@435 45 }
duke@435 46
duke@435 47 void ClassFileParser::classfile_parse_error(const char* msg, const char *name, TRAPS) {
duke@435 48 ResourceMark rm(THREAD);
coleenp@2497 49 Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_ClassFormatError(),
duke@435 50 msg, name, _class_name->as_C_string());
duke@435 51 }
duke@435 52
duke@435 53 void ClassFileParser::classfile_parse_error(const char* msg, int index, const char *name, TRAPS) {
duke@435 54 ResourceMark rm(THREAD);
coleenp@2497 55 Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_ClassFormatError(),
duke@435 56 msg, index, name, _class_name->as_C_string());
duke@435 57 }
duke@435 58
drchase@6680 59 PRAGMA_DIAG_POP
drchase@6680 60
duke@435 61 void StackMapStream::stackmap_format_error(const char* msg, TRAPS) {
duke@435 62 ResourceMark rm(THREAD);
duke@435 63 Exceptions::fthrow(
duke@435 64 THREAD_AND_LOCATION,
coleenp@2497 65 vmSymbols::java_lang_ClassFormatError(),
duke@435 66 "StackMapTable format error: %s", msg
duke@435 67 );
duke@435 68 }

mercurial