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

Unified Diff: src/crankshaft/hydrogen.cc

Issue 2104953002: Version 5.2.361.28 (cherry-pick) (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@5.2
Patch Set: Created 4 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 | « include/v8-version.h ('k') | test/mjsunit/regress/regress-5033.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/crankshaft/hydrogen.cc
diff --git a/src/crankshaft/hydrogen.cc b/src/crankshaft/hydrogen.cc
index 31ef3bfeea8449141c6e363e501831ce7cc4c7b4..9c5fa15358e03797a1a2b8757fa2385b066de3c8 100644
--- a/src/crankshaft/hydrogen.cc
+++ b/src/crankshaft/hydrogen.cc
@@ -8586,6 +8586,10 @@ bool HOptimizedGraphBuilder::TryInline(Handle<JSFunction> target,
TraceInline(target, caller, "parse failure");
return false;
}
+ if (target_shared->dont_crankshaft()) {
+ TraceInline(target, caller, "ParseAndAnalyze found incompatibility");
+ return false;
+ }
if (target_info.scope()->num_heap_slots() > 0) {
TraceInline(target, caller, "target has context-allocated variables");
« no previous file with comments | « include/v8-version.h ('k') | test/mjsunit/regress/regress-5033.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698