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

Unified Diff: src/builtins/x87/builtins-x87.cc

Issue 2655013002: [Builtins] Smi-check the spread and go to runtime in CheckSpreadAndPushToStack. (Closed)
Patch Set: Put a try/catch in the regression test so it doesn't fail Created 3 years, 11 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/builtins/x64/builtins-x64.cc ('k') | test/mjsunit/es6/spread-call.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/builtins/x87/builtins-x87.cc
diff --git a/src/builtins/x87/builtins-x87.cc b/src/builtins/x87/builtins-x87.cc
index 9651e7ba2f05a571f5ea016895ac24dbb8e56922..ac70827b6a08e455581304bbbfe9df0977b10533 100644
--- a/src/builtins/x87/builtins-x87.cc
+++ b/src/builtins/x87/builtins-x87.cc
@@ -2722,10 +2722,11 @@ static void CheckSpreadAndPushToStack(MacroAssembler* masm) {
Register spread_len = edx;
+ Label runtime_call, push_args;
__ mov(spread, Operand(esp, kPointerSize));
+ __ JumpIfSmi(spread, &runtime_call);
__ mov(spread_map, FieldOperand(spread, HeapObject::kMapOffset));
- Label runtime_call, push_args;
// Check that the spread is an array.
__ CmpInstanceType(spread_map, JS_ARRAY_TYPE);
__ j(not_equal, &runtime_call);
« no previous file with comments | « src/builtins/x64/builtins-x64.cc ('k') | test/mjsunit/es6/spread-call.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698