VerifyStack logic in Deoptimization::unpack_frames does not expect to see invoke bc at the top frame during normal deoptimization

While working on JDK-6848902 I've added -XX:+VerifyStack to arguments of compiler/6589834/Test_ia32.java test (it was suggested in comments in that test) and it seems like issue described in comment for original bug was never fixed (https://bugs.openjdk.java.net/browse/JDK-6589834?focusedCommentId=12388050&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-12388050) and stack verification is still failing:

Wrong number of expression stack elements during deoptimization
  Error occurred while verifying frame 0 (0..1, 0 is topmost)
  Fabricated interpreter frame had 3 expression stack elements
  Interpreter oop map had 2 expression stack elements
  try_next_mask = 0
  next_mask_expression_stack_size = -1
  callee_size_of_parameters = 0
  callee_max_locals = 0
  top_frame_expression_stack_adjustment = 0
  exec_mode = 0
  cur_invoke_parameter_size = 1
  Thread = 0x00007faea41b0000, thread ID = 7273
  Interpreted frames:
    Test_ia32.f([LTest_ia32;)I (bci 3)
    Test_ia32.run()V (bci 10)
 - sp: 0x00007fae8a54f7c0
 - thread: "Thread-4" #13 prio=5 os_prio=0 tid=0x00007faea41b0000 nid=0x1c69 runnable [0x00007fae8a54f000]
   java.lang.Thread.State: RUNNABLE
   JavaThread state: _thread_in_Java
Thread: 0x00007faea41b0000 [0x1c69] State: _running _has_called_back 0 _at_poll_safepoint 0
   JavaThread state: _thread_in_Java
 - frame size: 8
 - interpreter_frame -> sp: 0x00007fae8a54f738
 - interpreter_frame -> sp: 0x00007fae8a54f7a0