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

Side by Side Diff: src/arm64/lithium-codegen-arm64.cc

Issue 714663002: Fix has_constant_parameter_count() confusion in LReturn (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « src/arm/lithium-codegen-arm.cc ('k') | src/hydrogen-instructions.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 2013 the V8 project authors. All rights reserved. 1 // Copyright 2013 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 #include "src/arm64/lithium-codegen-arm64.h" 7 #include "src/arm64/lithium-codegen-arm64.h"
8 #include "src/arm64/lithium-gap-resolver-arm64.h" 8 #include "src/arm64/lithium-gap-resolver-arm64.h"
9 #include "src/base/bits.h" 9 #include "src/base/bits.h"
10 #include "src/code-factory.h" 10 #include "src/code-factory.h"
(...skipping 4748 matching lines...) Expand 10 before | Expand all | Expand 10 after
4759 Register stack_pointer = masm()->StackPointer(); 4759 Register stack_pointer = masm()->StackPointer();
4760 __ Mov(stack_pointer, fp); 4760 __ Mov(stack_pointer, fp);
4761 no_frame_start = masm_->pc_offset(); 4761 no_frame_start = masm_->pc_offset();
4762 __ Pop(fp, lr); 4762 __ Pop(fp, lr);
4763 } 4763 }
4764 4764
4765 if (instr->has_constant_parameter_count()) { 4765 if (instr->has_constant_parameter_count()) {
4766 int parameter_count = ToInteger32(instr->constant_parameter_count()); 4766 int parameter_count = ToInteger32(instr->constant_parameter_count());
4767 __ Drop(parameter_count + 1); 4767 __ Drop(parameter_count + 1);
4768 } else { 4768 } else {
4769 DCHECK(info()->IsStub()); // Functions would need to drop one more value.
4769 Register parameter_count = ToRegister(instr->parameter_count()); 4770 Register parameter_count = ToRegister(instr->parameter_count());
4770 __ DropBySMI(parameter_count); 4771 __ DropBySMI(parameter_count);
4771 } 4772 }
4772 __ Ret(); 4773 __ Ret();
4773 4774
4774 if (no_frame_start != -1) { 4775 if (no_frame_start != -1) {
4775 info_->AddNoFrameRange(no_frame_start, masm_->pc_offset()); 4776 info_->AddNoFrameRange(no_frame_start, masm_->pc_offset());
4776 } 4777 }
4777 } 4778 }
4778 4779
(...skipping 1257 matching lines...) Expand 10 before | Expand all | Expand 10 after
6036 Handle<ScopeInfo> scope_info = instr->scope_info(); 6037 Handle<ScopeInfo> scope_info = instr->scope_info();
6037 __ Push(scope_info); 6038 __ Push(scope_info);
6038 __ Push(ToRegister(instr->function())); 6039 __ Push(ToRegister(instr->function()));
6039 CallRuntime(Runtime::kPushBlockContext, 2, instr); 6040 CallRuntime(Runtime::kPushBlockContext, 2, instr);
6040 RecordSafepoint(Safepoint::kNoLazyDeopt); 6041 RecordSafepoint(Safepoint::kNoLazyDeopt);
6041 } 6042 }
6042 6043
6043 6044
6044 6045
6045 } } // namespace v8::internal 6046 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/arm/lithium-codegen-arm.cc ('k') | src/hydrogen-instructions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698