Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(812)

Unified Diff: src/frames.cc

Issue 1632913003: [heap] Move to page lookups for SemiSpace, NewSpace, and Heap containment methods (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: mips ports Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/assembler.cc ('k') | src/heap/heap.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/frames.cc
diff --git a/src/frames.cc b/src/frames.cc
index a57d28bde6c454562dd07e2df0ca6095a36c9940..47b4a1b3249bddb9fe886b38d760610596682abb 100644
--- a/src/frames.cc
+++ b/src/frames.cc
@@ -1516,10 +1516,6 @@ Code* InnerPointerToCodeCache::GcSafeCastToCode(HeapObject* object,
Code* InnerPointerToCodeCache::GcSafeFindCodeForInnerPointer(
Address inner_pointer) {
Heap* heap = isolate_->heap();
- if (!heap->code_space()->Contains(inner_pointer) &&
- !heap->lo_space()->Contains(inner_pointer)) {
- return nullptr;
- }
// Check if the inner pointer points into a large object chunk.
LargePage* large_page = heap->lo_space()->FindPage(inner_pointer);
@@ -1527,6 +1523,10 @@ Code* InnerPointerToCodeCache::GcSafeFindCodeForInnerPointer(
return GcSafeCastToCode(large_page->GetObject(), inner_pointer);
}
+ if (!heap->code_space()->Contains(inner_pointer)) {
+ return nullptr;
+ }
+
// Iterate through the page until we reach the end or find an object starting
// after the inner pointer.
Page* page = Page::FromAddress(inner_pointer);
« no previous file with comments | « src/assembler.cc ('k') | src/heap/heap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698