From 1a74b23a2f8fb75c18f47d8b0475ddc7b0d613f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rickard=20B=C3=A4ckman?= <rbackman@openjdk.org>
Date: Tue, 26 Feb 2013 14:09:52 +0100
Subject: [PATCH] 8008340: [sampling] assert(upper->pc_offset() >= pc_offset)
 failed: sanity

Reviewed-by: kvn, sla
---
 hotspot/src/cpu/sparc/vm/frame_sparc.cpp | 5 +++++
 hotspot/src/cpu/x86/vm/frame_x86.cpp     | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/hotspot/src/cpu/sparc/vm/frame_sparc.cpp b/hotspot/src/cpu/sparc/vm/frame_sparc.cpp
index 93ae06e0f6d..1c368ffe84e 100644
--- a/hotspot/src/cpu/sparc/vm/frame_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/frame_sparc.cpp
@@ -216,6 +216,11 @@ bool frame::safe_for_sender(JavaThread *thread) {
       }
     }
 
+    // Could just be some random pointer within the codeBlob
+    if (!_cb->code_contains(_pc)) {
+      return false;
+    }
+
     // Entry frame checks
     if (is_entry_frame()) {
       // an entry frame must have a valid fp.
diff --git a/hotspot/src/cpu/x86/vm/frame_x86.cpp b/hotspot/src/cpu/x86/vm/frame_x86.cpp
index 0718f592aa6..fa0855c458c 100644
--- a/hotspot/src/cpu/x86/vm/frame_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/frame_x86.cpp
@@ -91,6 +91,12 @@ bool frame::safe_for_sender(JavaThread *thread) {
         return false;
       }
     }
+
+    // Could just be some random pointer within the codeBlob
+    if (!_cb->code_contains(_pc)) {
+      return false;
+    }
+
     // Entry frame checks
     if (is_entry_frame()) {
       // an entry frame must have a valid fp.