jdk8-mips64-public/hotspot: comparison src/share/vm/classfile/stackMapFrame.cpp

-:c3c2141203e7
+:4ee06e614636
 /*
-* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2003, 2012, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 #include "oops/symbol.hpp"
 #include "runtime/handles.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
 StackMapFrame::StackMapFrame(u2 max_locals, u2 max_stack, ClassVerifier* v) :
-_offset(0), _locals_size(0), _stack_size(0), _flags(0),
+_offset(0), _locals_size(0), _stack_size(0),
-_max_locals(max_locals), _max_stack(max_stack),
+_stack_mark(0), _flags(0), _max_locals(max_locals),
-_verifier(v) {
+_max_stack(max_stack), _verifier(v) {
 Thread* thr = v->thread();
 _locals = NEW_RESOURCE_ARRAY_IN_THREAD(thr, VerificationType, max_locals);
 _stack = NEW_RESOURCE_ARRAY_IN_THREAD(thr, VerificationType, max_stack);
 int32_t i;
 for(i = 0; i < max_locals; i++) {
 for (int32_t i = 0; i < len; i++) {
 _stack[i] = src->stack()[i];
 }
 }
+// Returns the location of the first mismatch, or 'len' if there are no
-bool StackMapFrame::is_assignable_to(
+// mismatches
+int StackMapFrame::is_assignable_to(
 VerificationType* from, VerificationType* to, int32_t len, TRAPS) const {
-for (int32_t i = 0; i < len; i++) {
+int32_t i = 0;
-bool subtype = to[i].is_assignable_from(
+for (i = 0; i < len; i++) {
-from[i], verifier(), THREAD);
+if (!to[i].is_assignable_from(from[i], verifier(), THREAD)) {
-if (!subtype) {
+break;
-return false;
+}
 }
-}
+return i;
-return true;
 }
 bool StackMapFrame::has_flag_match_exception(
 const StackMapFrame* target) const {
 // We allow flags of {UninitThis} to assign to {} if-and-only-if the
 return true;
 }
 bool StackMapFrame::is_assignable_to(
-const StackMapFrame* target, bool is_exception_handler, TRAPS) const {
+const StackMapFrame* target, bool is_exception_handler,
-if (_max_locals != target->max_locals() ||
+ErrorContext* ctx, TRAPS) const {
-_stack_size != target->stack_size()) {
+if (_max_locals != target->max_locals()) {
+*ctx = ErrorContext::locals_size_mismatch(
+_offset, (StackMapFrame*)this, (StackMapFrame*)target);
+return false;
+}
+if (_stack_size != target->stack_size()) {
+*ctx = ErrorContext::stack_size_mismatch(
+_offset, (StackMapFrame*)this, (StackMapFrame*)target);
 return false;
 }
 // Only need to compare type elements up to target->locals() or target->stack().
 // The remaining type elements in this state can be ignored because they are
 // assignable to bogus type.
-bool match_locals = is_assignable_to(
+int mismatch_loc;
-_locals, target->locals(), target->locals_size(), CHECK_false);
+mismatch_loc = is_assignable_to(
-bool match_stack = is_assignable_to(
+_locals, target->locals(), target->locals_size(), THREAD);
-_stack, target->stack(), _stack_size, CHECK_false);
+if (mismatch_loc != target->locals_size()) {
+*ctx = ErrorContext::bad_type(target->offset(),
+TypeOrigin::local(mismatch_loc, (StackMapFrame*)this),
+TypeOrigin::sm_local(mismatch_loc, (StackMapFrame*)target));
+return false;
+}
+mismatch_loc = is_assignable_to(_stack, target->stack(), _stack_size, THREAD);
+if (mismatch_loc != _stack_size) {
+*ctx = ErrorContext::bad_type(target->offset(),
+TypeOrigin::stack(mismatch_loc, (StackMapFrame*)this),
+TypeOrigin::sm_stack(mismatch_loc, (StackMapFrame*)target));
+return false;
+}
 bool match_flags = (_flags | target->flags()) == target->flags();
+if (match_flags || is_exception_handler && has_flag_match_exception(target)) {
-return match_locals && match_stack &&
+return true;
-(match_flags || (is_exception_handler && has_flag_match_exception(target)));
+} else {
+*ctx = ErrorContext::bad_flags(target->offset(),
+(StackMapFrame*)this, (StackMapFrame*)target);
+return false;
+}
 }
 VerificationType StackMapFrame::pop_stack_ex(VerificationType type, TRAPS) {
 if (_stack_size <= 0) {
-verifier()->verify_error(_offset, "Operand stack underflow");
+verifier()->verify_error(
+ErrorContext::stack_underflow(_offset, this),
+"Operand stack underflow");
 return VerificationType::bogus_type();
 }
 VerificationType top = _stack[--_stack_size];
 bool subtype = type.is_assignable_from(
 top, verifier(), CHECK_(VerificationType::bogus_type()));
 if (!subtype) {
-verifier()->verify_error(_offset, "Bad type on operand stack");
+verifier()->verify_error(
+ErrorContext::bad_type(_offset, stack_top_ctx(),
+TypeOrigin::implicit(type)),
+"Bad type on operand stack");
 return VerificationType::bogus_type();
 }
-NOT_PRODUCT( _stack[_stack_size] = VerificationType::bogus_type(); )
 return top;
 }
 VerificationType StackMapFrame::get_local(
 int32_t index, VerificationType type, TRAPS) {
 if (index >= _max_locals) {
-verifier()->verify_error(_offset, "Local variable table overflow");
+verifier()->verify_error(
+ErrorContext::bad_local_index(_offset, index),
+"Local variable table overflow");
 return VerificationType::bogus_type();
 }
 bool subtype = type.is_assignable_from(_locals[index],
 verifier(), CHECK_(VerificationType::bogus_type()));
 if (!subtype) {
-verifier()->verify_error(_offset, "Bad local variable type");
+verifier()->verify_error(
+ErrorContext::bad_type(_offset,
+TypeOrigin::local(index, this),
+TypeOrigin::implicit(type)),
+"Bad local variable type");
 return VerificationType::bogus_type();
 }
 if(index >= _locals_size) { _locals_size = index + 1; }
 return _locals[index];
 }
 void StackMapFrame::get_local_2(
 int32_t index, VerificationType type1, VerificationType type2, TRAPS) {
 assert(type1.is_long() || type1.is_double(), "must be long/double");
 assert(type2.is_long2() || type2.is_double2(), "must be long/double_2");
 if (index >= _locals_size - 1) {
-verifier()->verify_error(_offset, "get long/double overflows locals");
+verifier()->verify_error(
+ErrorContext::bad_local_index(_offset, index),
+"get long/double overflows locals");
 return;
 }
-bool subtype1 = type1.is_assignable_from(
+bool subtype = type1.is_assignable_from(_locals[index], verifier(), CHECK);
-_locals[index], verifier(), CHECK);
+if (!subtype) {
-bool subtype2 = type2.is_assignable_from(
+verifier()->verify_error(
-_locals[index+1], verifier(), CHECK);
+ErrorContext::bad_type(_offset,
-if (!subtype1 || !subtype2) {
+TypeOrigin::local(index, this), TypeOrigin::implicit(type1)),
-verifier()->verify_error(_offset, "Bad local variable type");
+"Bad local variable type");
-return;
+} else {
+subtype = type2.is_assignable_from(_locals[index + 1], verifier(), CHECK);
+if (!subtype) {
+/* Unreachable? All local store routines convert a split long or double
+* into a TOP during the store.  So we should never end up seeing an
+* orphaned half.  */
+verifier()->verify_error(
+ErrorContext::bad_type(_offset,
+TypeOrigin::local(index + 1, this), TypeOrigin::implicit(type2)),
+"Bad local variable type");
+}
 }
 }
 void StackMapFrame::set_local(int32_t index, VerificationType type, TRAPS) {
 assert(!type.is_check(), "Must be a real type");
 if (index >= _max_locals) {
-verifier()->verify_error("Local variable table overflow", _offset);
+verifier()->verify_error(
+ErrorContext::bad_local_index(_offset, index),
+"Local variable table overflow");
 return;
 }
 // If type at index is double or long, set the next location to be unusable
 if (_locals[index].is_double() || _locals[index].is_long()) {
 assert((index + 1) < _locals_size, "Local variable table overflow");
 void StackMapFrame::set_local_2(
 int32_t index, VerificationType type1, VerificationType type2, TRAPS) {
 assert(type1.is_long() || type1.is_double(), "must be long/double");
 assert(type2.is_long2() || type2.is_double2(), "must be long/double_2");
 if (index >= _max_locals - 1) {
-verifier()->verify_error("Local variable table overflow", _offset);
+verifier()->verify_error(
+ErrorContext::bad_local_index(_offset, index),
+"Local variable table overflow");
 return;
 }
 // If type at index+1 is double or long, set the next location to be unusable
 if (_locals[index+1].is_double() || _locals[index+1].is_long()) {
 assert((index + 2) < _locals_size, "Local variable table overflow");
 #endif
 _locals_size = index + 2;
 }
 }
-#ifndef PRODUCT
+TypeOrigin StackMapFrame::stack_top_ctx() {
+return TypeOrigin::stack(_stack_size, this);
-void StackMapFrame::print() const {
+}
-tty->print_cr("stackmap_frame[%d]:", _offset);
-tty->print_cr("flags = 0x%x", _flags);
+void StackMapFrame::print_on(outputStream* str) const {
-tty->print("locals[%d] = { ", _locals_size);
+str->indent().print_cr("bci: @%d", _offset);
-for (int32_t i = 0; i < _locals_size; i++) {
+str->indent().print_cr("flags: {%s }",
-_locals[i].print_on(tty);
+flag_this_uninit() ? " flagThisUninit" : "");
-}
+str->indent().print("locals: {");
-tty->print_cr(" }");
+for (int32_t i = 0; i < _locals_size; ++i) {
-tty->print("stack[%d] = { ", _stack_size);
+str->print(" ");
-for (int32_t j = 0; j < _stack_size; j++) {
+_locals[i].print_on(str);
-_stack[j].print_on(tty);
+if (i != _locals_size - 1) {
-}
+str->print(",");
-tty->print_cr(" }");
+}
 }
+str->print_cr(" }");
-#endif
+str->indent().print("stack: {");
+for (int32_t j = 0; j < _stack_size; ++j) {
+str->print(" ");
+_stack[j].print_on(str);
+if (j != _stack_size - 1) {
+str->print(",");
+}
+}
+str->print_cr(" }");
+}

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/share/vm/classfile/stackMapFrame.cpp

src/share/vm/classfile/stackMapFrame.cpp