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

Side by Side Diff: src/arm/builtins-arm.cc

Issue 1061263003: Fix missing SmiTag in failure path of r27614 (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | src/arm64/builtins-arm64.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/v8.h" 5 #include "src/v8.h"
6 6
7 #if V8_TARGET_ARCH_ARM 7 #if V8_TARGET_ARCH_ARM
8 8
9 #include "src/codegen.h" 9 #include "src/codegen.h"
10 #include "src/debug.h" 10 #include "src/debug.h"
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 if (argc_is_tagged == kArgcIsSmiTagged) { 849 if (argc_is_tagged == kArgcIsSmiTagged) {
850 __ cmp(r2, Operand::PointerOffsetFromSmiKey(argc)); 850 __ cmp(r2, Operand::PointerOffsetFromSmiKey(argc));
851 } else { 851 } else {
852 DCHECK(argc_is_tagged == kArgcIsUntaggedInt); 852 DCHECK(argc_is_tagged == kArgcIsUntaggedInt);
853 __ cmp(r2, Operand(argc, LSL, kPointerSizeLog2)); 853 __ cmp(r2, Operand(argc, LSL, kPointerSizeLog2));
854 } 854 }
855 __ b(gt, &okay); // Signed comparison. 855 __ b(gt, &okay); // Signed comparison.
856 856
857 // Out of stack space. 857 // Out of stack space.
858 __ ldr(r1, MemOperand(fp, calleeOffset)); 858 __ ldr(r1, MemOperand(fp, calleeOffset));
859 if (argc_is_tagged == kArgcIsUntaggedInt) {
860 __ SmiTag(argc);
861 }
859 __ Push(r1, argc); 862 __ Push(r1, argc);
860 __ InvokeBuiltin(Builtins::STACK_OVERFLOW, CALL_FUNCTION); 863 __ InvokeBuiltin(Builtins::STACK_OVERFLOW, CALL_FUNCTION);
861 864
862 __ bind(&okay); 865 __ bind(&okay);
863 } 866 }
864 867
865 868
866 static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm, 869 static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
867 bool is_construct) { 870 bool is_construct) {
868 // Called from Generate_JS_Entry 871 // Called from Generate_JS_Entry
(...skipping 908 matching lines...) Expand 10 before | Expand all | Expand 10 after
1777 __ bkpt(0); 1780 __ bkpt(0);
1778 } 1781 }
1779 } 1782 }
1780 1783
1781 1784
1782 #undef __ 1785 #undef __
1783 1786
1784 } } // namespace v8::internal 1787 } } // namespace v8::internal
1785 1788
1786 #endif // V8_TARGET_ARCH_ARM 1789 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/arm64/builtins-arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698