1.1 --- a/src/share/vm/classfile/stackMapTable.hpp Mon Aug 06 09:34:40 2012 -0700
1.2 +++ b/src/share/vm/classfile/stackMapTable.hpp Mon Aug 06 15:54:45 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -26,6 +26,7 @@
1.11 #define SHARE_VM_CLASSFILE_STACKMAPTABLE_HPP
1.12
1.13 #include "classfile/stackMapFrame.hpp"
1.14 +#include "classfile/verifier.hpp"
1.15 #include "memory/allocation.hpp"
1.16 #include "oops/constantPoolOop.hpp"
1.17 #include "oops/methodOop.hpp"
1.18 @@ -73,12 +74,12 @@
1.19 // specified offset. Return true if the two frames match.
1.20 bool match_stackmap(
1.21 StackMapFrame* current_frame, int32_t offset,
1.22 - bool match, bool update, TRAPS) const;
1.23 + bool match, bool update, ErrorContext* ctx, TRAPS) const;
1.24 // Match and/or update current_frame to the frame in stackmap table with
1.25 // specified offset and frame index. Return true if the two frames match.
1.26 bool match_stackmap(
1.27 StackMapFrame* current_frame, int32_t offset, int32_t frame_index,
1.28 - bool match, bool update, TRAPS) const;
1.29 + bool match, bool update, ErrorContext* ctx, TRAPS) const;
1.30
1.31 // Check jump instructions. Make sure there are no uninitialized
1.32 // instances on backward branch.
1.33 @@ -93,8 +94,7 @@
1.34 void check_new_object(
1.35 const StackMapFrame* frame, int32_t target, TRAPS) const;
1.36
1.37 - // Debugging
1.38 - void print() const PRODUCT_RETURN;
1.39 + void print_on(outputStream* str) const;
1.40 };
1.41
1.42 class StackMapStream : StackObj {
