src/cpu/x86/vm/sharedRuntime_x86_64.cpp

*** 2817,2826 ****
--- 2817,2827 ----
      __ movl(c_rarg1, Address(r15_thread, in_bytes(JavaThread::pending_deoptimization_offset())));
      __ movl(Address(r15_thread, in_bytes(JavaThread::pending_deoptimization_offset())), -1);
  
      __ movl(r14, (int32_t)Deoptimization::Unpack_reexecute);
      __ mov(c_rarg0, r15_thread);
+     __ movl(c_rarg2, r14); // exec mode
      __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap)));
      oop_maps->add_gc_map( __ pc()-start, map->deep_copy());
  
      __ reset_last_Java_frame(false, false);
  
*** 2903,2912 ****
--- 2904,2914 ----
      __ stop("SharedRuntime::generate_deopt_blob: last_Java_fp not cleared");
      __ bind(L);
    }
  #endif // ASSERT
    __ mov(c_rarg0, r15_thread);
+   __ movl(c_rarg1, r14); // exec_mode
    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::fetch_unroll_info)));
  
    // Need to have an oopmap that tells fetch_unroll_info where to
    // find any register it might need.
    oop_maps->add_gc_map(__ pc() - start, map);
*** 2920,2929 ****
--- 2922,2932 ----
  #endif
  
    // Load UnrollBlock* into rdi
    __ mov(rdi, rax);
  
+   __ movl(r14, Address(rdi, Deoptimization::UnrollBlock::unpack_kind_offset_in_bytes()));
     Label noException;
    __ cmpl(r14, Deoptimization::Unpack_exception);   // Was exception pending?
    __ jcc(Assembler::notEqual, noException);
    __ movptr(rax, Address(r15_thread, JavaThread::exception_oop_offset()));
    // QQQ this is useless it was NULL above
*** 3138,3147 ****
--- 3141,3151 ----
    // Thread is in rdi already.
    //
    // UnrollBlock* uncommon_trap(JavaThread* thread, jint unloaded_class_index);
  
    __ mov(c_rarg0, r15_thread);
+   __ movl(c_rarg2, Deoptimization::Unpack_uncommon_trap);
    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap)));
  
    // Set an oopmap for the call site
    OopMapSet* oop_maps = new OopMapSet();
    OopMap* map = new OopMap(SimpleRuntimeFrame::framesize, 0);
*** 3153,3162 ****
--- 3157,3176 ----
    __ reset_last_Java_frame(false, false);
  
    // Load UnrollBlock* into rdi
    __ mov(rdi, rax);
  
+ #ifdef ASSERT
+   { Label L;
+     __ cmpptr(Address(rdi, Deoptimization::UnrollBlock::unpack_kind_offset_in_bytes()),
+             (int32_t)Deoptimization::Unpack_uncommon_trap);
+     __ jcc(Assembler::equal, L);
+     __ stop("SharedRuntime::generate_deopt_blob: expected Unpack_uncommon_trap");
+     __ bind(L);
+   }
+ #endif
+ 
    // Pop all the frames we must move/replace.
    //
    // Frame picture (youngest to oldest)
    // 1: self-frame (no frame link)
    // 2: deopting frame  (no frame link)