Index: src/arm/full-codegen-arm.cc |
diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc |
index a551937ac573fbff912f553485e00e8dc85711cf..452dd2cb3cf6fc6c0cc93e88f30bba975fdc7966 100644 |
--- a/src/arm/full-codegen-arm.cc |
+++ b/src/arm/full-codegen-arm.cc |
@@ -4615,18 +4615,11 @@ void FullCodeGenerator::EmitDebugIsActive(CallRuntime* expr) { |
void FullCodeGenerator::VisitCallRuntime(CallRuntime* expr) { |
- InlineFunctionGenerator generator = FindInlineFunctionGenerator(expr); |
- if (generator != nullptr) { |
- Comment cmnt(masm_, "[ InlineRuntimeCall"); |
- EmitInlineRuntimeCall(expr, generator); |
- return; |
- } |
- |
- Comment cmnt(masm_, "[ CallRuntime"); |
ZoneList<Expression*>* args = expr->arguments(); |
int arg_count = args->length(); |
if (expr->is_jsruntime()) { |
+ Comment cmnt(masm_, "[ CallRuntime"); |
// Push the builtins object as the receiver. |
Register receiver = LoadDescriptor::ReceiverRegister(); |
__ ldr(receiver, GlobalObjectOperand()); |
@@ -4649,7 +4642,6 @@ void FullCodeGenerator::VisitCallRuntime(CallRuntime* expr) { |
__ str(r0, MemOperand(sp, kPointerSize)); |
// Push the arguments ("left-to-right"). |
- int arg_count = args->length(); |
for (int i = 0; i < arg_count; i++) { |
VisitForStackValue(args->at(i)); |
} |
@@ -4664,15 +4656,29 @@ void FullCodeGenerator::VisitCallRuntime(CallRuntime* expr) { |
__ ldr(cp, MemOperand(fp, StandardFrameConstants::kContextOffset)); |
context()->DropAndPlug(1, r0); |
+ |
} else { |
- // Push the arguments ("left-to-right"). |
- for (int i = 0; i < arg_count; i++) { |
- VisitForStackValue(args->at(i)); |
- } |
+ const Runtime::Function* function = expr->function(); |
+ switch (function->function_id) { |
+#define CALL_INTRINSIC_GENERATOR(Name) \ |
+ case Runtime::kInline##Name: { \ |
+ Comment cmnt(masm_, "[ Inline" #Name); \ |
+ return Emit##Name(expr); \ |
+ } |
+ FOR_EACH_FULL_CODE_INTRINSIC(CALL_INTRINSIC_GENERATOR) |
+#undef CALL_INTRINSIC_GENERATOR |
+ default: { |
+ Comment cmnt(masm_, "[ CallRuntime for unhandled intrinsic"); |
+ // Push the arguments ("left-to-right"). |
+ for (int i = 0; i < arg_count; i++) { |
+ VisitForStackValue(args->at(i)); |
+ } |
- // Call the C runtime function. |
- __ CallRuntime(expr->function(), arg_count); |
- context()->Plug(r0); |
+ // Call the C runtime function. |
+ __ CallRuntime(expr->function(), arg_count); |
+ context()->Plug(r0); |
+ } |
+ } |
} |
} |