src/cpu/s390/vm/templateInterpreterGenerator_s390.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2016 SAP SE. 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
--- 1,7 ----
  /*
!  * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2016 SAP SE. 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
*** 674,683 ****
--- 674,687 ----
  
    // #args is in rightmost byte of the _flags field.
    __ z_llgc(size, Address(cache, offset, flags_offset+(sizeof(size_t)-1)));
    __ z_sllg(size, size, Interpreter::logStackElementSize); // Each argument size in bytes.
    __ z_agr(Z_esp, size);                                   // Pop arguments.
+ 
+   __ check_and_handle_popframe(Z_thread);
+   __ check_and_handle_earlyret(Z_thread);
+ 
    __ dispatch_next(state, step);
  
    BLOCK_COMMENT("} return_entry");
  
    return entry;