Mercurial > hg > truffle
annotate src/share/vm/classfile/classFileError.cpp @ 20242:d14a18794c90
8051012: Regression in verifier for <init> method call from inside of a branch
Summary: Fix stackmap matching for branches.
Reviewed-by: coleenp, lfoltan, acorn
| author | hseigel |
|---|---|
| date | Sat, 02 Aug 2014 16:28:59 -0400 |
| parents | 78bbf4d43a14 |
| children |
| rev | line source |
|---|---|
| 0 | 1 /* |
|
17937
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
2426
diff
changeset
|
2 * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. |
| 0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 * | |
| 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 | |
| 7 * published by the Free Software Foundation. | |
| 8 * | |
| 9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
| 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 * version 2 for more details (a copy is included in the LICENSE file that | |
| 13 * accompanied this code). | |
| 14 * | |
| 15 * You should have received a copy of the GNU General Public License version | |
| 16 * 2 along with this work; if not, write to the Free Software Foundation, | |
| 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
| 18 * | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
21 * questions. |
| 0 | 22 * |
| 23 */ | |
| 24 | |
| 1972 | 25 #include "precompiled.hpp" |
| 26 #include "classfile/classFileParser.hpp" | |
| 27 #include "classfile/stackMapTable.hpp" | |
| 28 #include "classfile/verifier.hpp" | |
| 0 | 29 |
| 30 // Keep these in a separate file to prevent inlining | |
| 31 | |
|
17937
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
2426
diff
changeset
|
32 PRAGMA_DIAG_PUSH |
|
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
2426
diff
changeset
|
33 PRAGMA_FORMAT_NONLITERAL_IGNORED |
|
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
2426
diff
changeset
|
34 |
| 0 | 35 void ClassFileParser::classfile_parse_error(const char* msg, TRAPS) { |
| 36 ResourceMark rm(THREAD); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
37 Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_ClassFormatError(), |
| 0 | 38 msg, _class_name->as_C_string()); |
| 39 } | |
| 40 | |
| 41 void ClassFileParser::classfile_parse_error(const char* msg, int index, TRAPS) { | |
| 42 ResourceMark rm(THREAD); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
43 Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_ClassFormatError(), |
| 0 | 44 msg, index, _class_name->as_C_string()); |
| 45 } | |
| 46 | |
| 47 void ClassFileParser::classfile_parse_error(const char* msg, const char *name, TRAPS) { | |
| 48 ResourceMark rm(THREAD); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
49 Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_ClassFormatError(), |
| 0 | 50 msg, name, _class_name->as_C_string()); |
| 51 } | |
| 52 | |
| 53 void ClassFileParser::classfile_parse_error(const char* msg, int index, const char *name, TRAPS) { | |
| 54 ResourceMark rm(THREAD); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
55 Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_ClassFormatError(), |
| 0 | 56 msg, index, name, _class_name->as_C_string()); |
| 57 } | |
| 58 | |
|
17937
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
2426
diff
changeset
|
59 PRAGMA_DIAG_POP |
|
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
2426
diff
changeset
|
60 |
| 0 | 61 void StackMapStream::stackmap_format_error(const char* msg, TRAPS) { |
| 62 ResourceMark rm(THREAD); | |
| 63 Exceptions::fthrow( | |
| 64 THREAD_AND_LOCATION, | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
65 vmSymbols::java_lang_ClassFormatError(), |
| 0 | 66 "StackMapTable format error: %s", msg |
| 67 ); | |
| 68 } |