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

Unified Diff: src/type-info.cc

Issue 17030011: Merged r15167 into trunk branch. (Closed) Base URL: https://v8.googlecode.com/svn/trunk
Patch Set: Created 7 years, 6 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 | « no previous file | src/version.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/type-info.cc
diff --git a/src/type-info.cc b/src/type-info.cc
index 32aef1cc5ef4472a8d2cb842240882f4a608cbdf..769354781d8ee2291228cfd18bbce31784c95c64 100644
--- a/src/type-info.cc
+++ b/src/type-info.cc
@@ -356,7 +356,7 @@ void TypeFeedbackOracle::CompareTypes(TypeFeedbackId id,
Map* raw_map = code->FindFirstMap();
if (raw_map != NULL) {
raw_map = raw_map->CurrentMapForDeprecated();
- if (!CanRetainOtherContext(raw_map, *native_context_)) {
+ if (raw_map != NULL && !CanRetainOtherContext(raw_map, *native_context_)) {
map = handle(raw_map, isolate_);
}
}
« no previous file with comments | « no previous file | src/version.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698