comparison src/share/vm/classfile/stackMapTable.hpp @ 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 da91efe96a93
children c77d5db18942
comparison
equal deleted inserted replaced
20241:bcd72ab4d91f 20242:d14a18794c90
72 72
73 // Match and/or update current_frame to the frame in stackmap table with 73 // Match and/or update current_frame to the frame in stackmap table with
74 // specified offset. Return true if the two frames match. 74 // specified offset. Return true if the two frames match.
75 bool match_stackmap( 75 bool match_stackmap(
76 StackMapFrame* current_frame, int32_t offset, 76 StackMapFrame* current_frame, int32_t offset,
77 bool match, bool update, ErrorContext* ctx, TRAPS) const; 77 bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const;
78 // Match and/or update current_frame to the frame in stackmap table with 78 // Match and/or update current_frame to the frame in stackmap table with
79 // specified offset and frame index. Return true if the two frames match. 79 // specified offset and frame index. Return true if the two frames match.
80 bool match_stackmap( 80 bool match_stackmap(
81 StackMapFrame* current_frame, int32_t offset, int32_t frame_index, 81 StackMapFrame* current_frame, int32_t offset, int32_t frame_index,
82 bool match, bool update, ErrorContext* ctx, TRAPS) const; 82 bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const;
83 83
84 // Check jump instructions. Make sure there are no uninitialized 84 // Check jump instructions. Make sure there are no uninitialized
85 // instances on backward branch. 85 // instances on backward branch.
86 void check_jump_target(StackMapFrame* frame, int32_t target, TRAPS) const; 86 void check_jump_target(StackMapFrame* frame, int32_t target, TRAPS) const;
87 87