src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 1191,1210 ****
  
    // If result is an oop unbox and store it in frame where gc will see it
    // and result handler will pick it up
  
    {
!     Label no_oop, not_weak, store_result;
      __ lea(t, ExternalAddress(AbstractInterpreter::result_handler(T_OBJECT)));
      __ cmpptr(t, Address(rbp, frame::interpreter_frame_result_handler_offset*wordSize));
      __ jcc(Assembler::notEqual, no_oop);
      // retrieve result
      __ pop(ltos);
!     // Unbox oop result, e.g. JNIHandles::resolve value.
!     __ resolve_jobject(rax /* value */,
!                        thread /* thread */,
!                        t /* tmp */);
      __ movptr(Address(rbp, frame::interpreter_frame_oop_temp_offset*wordSize), rax);
      // keep stack depth as expected by pushing oop which will eventually be discarded
      __ push(ltos);
      __ bind(no_oop);
    }
--- 1191,1210 ----
  
    // If result is an oop unbox and store it in frame where gc will see it
    // and result handler will pick it up
  
    {
!     Label no_oop, store_result;
      __ lea(t, ExternalAddress(AbstractInterpreter::result_handler(T_OBJECT)));
      __ cmpptr(t, Address(rbp, frame::interpreter_frame_result_handler_offset*wordSize));
      __ jcc(Assembler::notEqual, no_oop);
      // retrieve result
      __ pop(ltos);
!     __ testptr(rax, rax);
!     __ jcc(Assembler::zero, store_result);
!     __ movptr(rax, Address(rax, 0));
!     __ bind(store_result);
      __ movptr(Address(rbp, frame::interpreter_frame_oop_temp_offset*wordSize), rax);
      // keep stack depth as expected by pushing oop which will eventually be discarded
      __ push(ltos);
      __ bind(no_oop);
    }