Mercurial > hg > truffle
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/classfile/stackMapTable.hpp Thu Jan 16 13:25:25 2014 -0800 +++ b/src/share/vm/classfile/stackMapTable.hpp Sat Aug 02 16:28:59 2014 -0400 @@ -74,12 +74,12 @@ // specified offset. Return true if the two frames match. bool match_stackmap( StackMapFrame* current_frame, int32_t offset, - bool match, bool update, ErrorContext* ctx, TRAPS) const; + bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const; // Match and/or update current_frame to the frame in stackmap table with // specified offset and frame index. Return true if the two frames match. bool match_stackmap( StackMapFrame* current_frame, int32_t offset, int32_t frame_index, - bool match, bool update, ErrorContext* ctx, TRAPS) const; + bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const; // Check jump instructions. Make sure there are no uninitialized // instances on backward branch.