# HG changeset patch
# User ghaug
# Date 1553612420 -3600
# Node ID 656789f95658c698a6b9a8eb6fa48c52d4681c63
# Parent  6207397a660337416d113876bf6a30432a5c083f
8221479: Fix JFR profiling on s390
Reviewed-by: mdoerr, clanger

diff -r 6207397a6603 -r 656789f95658 src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp
--- a/src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp	Tue Mar 26 15:00:02 2019 -0700
+++ b/src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp	Tue Mar 26 16:00:20 2019 +0100
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016 SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019 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
@@ -63,7 +63,7 @@
 
     if (ret_frame.is_interpreted_frame()) {
       frame::z_ijava_state* istate = ret_frame.ijava_state_unchecked();
-       if (!((Method*)(istate->method))->is_metaspace_object()) {
+       if ((stack_base() >= (address)istate && (address)istate > stack_end()) || !((Method*)(istate->method))->is_metaspace_object()) {
          return false;
        }
        uint64_t reg_bcp = uc->uc_mcontext.gregs[13/*Z_BCP*/];