| OLD | NEW |
| 1 // Copyright 2014 the V8 project authors. All rights reserved. | 1 // Copyright 2014 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/compiler/code-generator.h" | 5 #include "src/compiler/code-generator.h" |
| 6 | 6 |
| 7 #include "src/arm/macro-assembler-arm.h" | 7 #include "src/arm/macro-assembler-arm.h" |
| 8 #include "src/compiler/code-generator-impl.h" | 8 #include "src/compiler/code-generator-impl.h" |
| 9 #include "src/compiler/gap-resolver.h" | 9 #include "src/compiler/gap-resolver.h" |
| 10 #include "src/compiler/node-matchers.h" | 10 #include "src/compiler/node-matchers.h" |
| (...skipping 1031 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1042 } | 1042 } |
| 1043 __ LeaveFrame(StackFrame::MANUAL); | 1043 __ LeaveFrame(StackFrame::MANUAL); |
| 1044 __ Ret(); | 1044 __ Ret(); |
| 1045 } else if (descriptor->IsJSFunctionCall() || needs_frame_) { | 1045 } else if (descriptor->IsJSFunctionCall() || needs_frame_) { |
| 1046 // Canonicalize JSFunction return sites for now. | 1046 // Canonicalize JSFunction return sites for now. |
| 1047 if (return_label_.is_bound()) { | 1047 if (return_label_.is_bound()) { |
| 1048 __ b(&return_label_); | 1048 __ b(&return_label_); |
| 1049 } else { | 1049 } else { |
| 1050 __ bind(&return_label_); | 1050 __ bind(&return_label_); |
| 1051 __ LeaveFrame(StackFrame::MANUAL); | 1051 __ LeaveFrame(StackFrame::MANUAL); |
| 1052 int pop_count = descriptor->IsJSFunctionCall() | 1052 int pop_count = static_cast<int>(descriptor->StackParameterCount()); |
| 1053 ? static_cast<int>(descriptor->JSParameterCount()) | |
| 1054 : (info()->IsStub() | |
| 1055 ? info()->code_stub()->GetStackParameterCount() | |
| 1056 : 0); | |
| 1057 if (pop_count != 0) { | 1053 if (pop_count != 0) { |
| 1058 __ Drop(pop_count); | 1054 __ Drop(pop_count); |
| 1059 } | 1055 } |
| 1060 __ Ret(); | 1056 __ Ret(); |
| 1061 } | 1057 } |
| 1062 } else { | 1058 } else { |
| 1063 __ Ret(); | 1059 __ Ret(); |
| 1064 } | 1060 } |
| 1065 } | 1061 } |
| 1066 | 1062 |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1268 } | 1264 } |
| 1269 } | 1265 } |
| 1270 } | 1266 } |
| 1271 } | 1267 } |
| 1272 | 1268 |
| 1273 #undef __ | 1269 #undef __ |
| 1274 | 1270 |
| 1275 } // namespace compiler | 1271 } // namespace compiler |
| 1276 } // namespace internal | 1272 } // namespace internal |
| 1277 } // namespace v8 | 1273 } // namespace v8 |
| OLD | NEW |