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

Unified Diff: src/full-codegen/x64/full-codegen-x64.cc

Issue 1391373004: Bailout for large object allocations in full code EmitFastOneByteArrayJoin. (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/full-codegen/ppc/full-codegen-ppc.cc ('k') | test/mjsunit/regress/regress-542823.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/full-codegen/x64/full-codegen-x64.cc
diff --git a/src/full-codegen/x64/full-codegen-x64.cc b/src/full-codegen/x64/full-codegen-x64.cc
index ac0d87991128a33ac820ddad1cb34eb7eab23820..c620e4863d0b81551d889560c7f270f653dfe0fb 100644
--- a/src/full-codegen/x64/full-codegen-x64.cc
+++ b/src/full-codegen/x64/full-codegen-x64.cc
@@ -4166,6 +4166,11 @@ void FullCodeGenerator::EmitFastOneByteArrayJoin(CallRuntime* expr) {
__ j(overflow, &bailout);
__ addl(string_length, scratch);
__ j(overflow, &bailout);
+ __ jmp(&bailout);
+
+ // Bailout for large object allocations.
+ __ cmpl(string_length, Immediate(Page::kMaxRegularHeapObjectSize));
+ __ j(greater, &bailout);
// Live registers and stack values:
// string_length: Total length of result string.
« no previous file with comments | « src/full-codegen/ppc/full-codegen-ppc.cc ('k') | test/mjsunit/regress/regress-542823.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698