Tue, 20 Jul 2010 08:41:42 -0700
6964170: Verifier crashes
Summary: Check if klassOop != NULL rather than klass_part != NULL
Reviewed-by: kamg, never
duke@435 | 1 | /* |
trims@1907 | 2 | * Copyright (c) 2005, 2006, 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 | |
duke@435 | 25 | #include "incls/_precompiled.incl" |
duke@435 | 26 | #include "incls/_classFileError.cpp.incl" |
duke@435 | 27 | |
duke@435 | 28 | // Keep these in a separate file to prevent inlining |
duke@435 | 29 | |
duke@435 | 30 | void ClassFileParser::classfile_parse_error(const char* msg, TRAPS) { |
duke@435 | 31 | ResourceMark rm(THREAD); |
duke@435 | 32 | Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbolHandles::java_lang_ClassFormatError(), |
duke@435 | 33 | msg, _class_name->as_C_string()); |
duke@435 | 34 | } |
duke@435 | 35 | |
duke@435 | 36 | void ClassFileParser::classfile_parse_error(const char* msg, int index, TRAPS) { |
duke@435 | 37 | ResourceMark rm(THREAD); |
duke@435 | 38 | Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbolHandles::java_lang_ClassFormatError(), |
duke@435 | 39 | msg, index, _class_name->as_C_string()); |
duke@435 | 40 | } |
duke@435 | 41 | |
duke@435 | 42 | void ClassFileParser::classfile_parse_error(const char* msg, const char *name, TRAPS) { |
duke@435 | 43 | ResourceMark rm(THREAD); |
duke@435 | 44 | Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbolHandles::java_lang_ClassFormatError(), |
duke@435 | 45 | msg, name, _class_name->as_C_string()); |
duke@435 | 46 | } |
duke@435 | 47 | |
duke@435 | 48 | void ClassFileParser::classfile_parse_error(const char* msg, int index, const char *name, TRAPS) { |
duke@435 | 49 | ResourceMark rm(THREAD); |
duke@435 | 50 | Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbolHandles::java_lang_ClassFormatError(), |
duke@435 | 51 | msg, index, name, _class_name->as_C_string()); |
duke@435 | 52 | } |
duke@435 | 53 | |
duke@435 | 54 | void StackMapStream::stackmap_format_error(const char* msg, TRAPS) { |
duke@435 | 55 | ResourceMark rm(THREAD); |
duke@435 | 56 | Exceptions::fthrow( |
duke@435 | 57 | THREAD_AND_LOCATION, |
duke@435 | 58 | vmSymbolHandles::java_lang_ClassFormatError(), |
duke@435 | 59 | "StackMapTable format error: %s", msg |
duke@435 | 60 | ); |
duke@435 | 61 | } |