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

Unified Diff: src/compiler/js-inlining-heuristic.cc

Issue 1418823005: [turbofan] Disable general purpose inlining with asm.js code. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 2 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/compiler/js-inlining-heuristic.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/compiler/js-inlining-heuristic.cc
diff --git a/src/compiler/js-inlining-heuristic.cc b/src/compiler/js-inlining-heuristic.cc
index 68fded170090d8343e2fddd5f22b65eec1734502..f0968218763deb420acf840b59534df801d8be4d 100644
--- a/src/compiler/js-inlining-heuristic.cc
+++ b/src/compiler/js-inlining-heuristic.cc
@@ -4,6 +4,7 @@
#include "src/compiler/js-inlining-heuristic.h"
+#include "src/compiler.h"
#include "src/compiler/dead-code-elimination.h" // TODO(mstarzinger): Remove!
#include "src/compiler/node-matchers.h"
#include "src/objects-inl.h"
@@ -54,6 +55,10 @@ Reduction JSInliningHeuristic::Reduce(Node* node) {
return NoChange();
}
+ // Avoid inlining within or across the boundary of asm.js code.
+ if (info_->shared_info()->asm_function()) return NoChange();
+ if (function->shared()->asm_function()) return NoChange();
+
// Gather feedback on how often this call site has been hit before.
CallFunctionParameters p = CallFunctionParametersOf(node->op());
int calls = -1; // Same default as CallICNexus::ExtractCallCount.
« no previous file with comments | « src/compiler/js-inlining-heuristic.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698