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. |