AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

ARM: Allow function inlining with context change.

Browse Source 
BUG=none
TEST=none
R=ulan@chromium.org

Review URL: https://codereview.chromium.org/25247002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17019 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
rodolph.perfetta@gmail.com 2013-09-30 15:08:20 +00:00
parent 2cf500644e
commit e7669d9308
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/arm/lithium-codegen-arm.cc
View File

@ -766,6 +766,10 @@ void LCodeGen::LoadContextFromDeferred(LOperand* context) {
__ Move(cp, ToRegister(context));
} else if (context->IsStackSlot()) {
__ ldr(cp, ToMemOperand(context));
} else if (context->IsConstantOperand()) {
HConstant* constant =
chunk_->LookupConstant(LConstantOperand::cast(context));
__ LoadObject(cp, Handle<Object>::cast(constant->handle(isolate())));
} else {
UNREACHABLE();
}

6
src/hydrogen.cc
View File

@ -6383,7 +6383,7 @@ bool HOptimizedGraphBuilder::TryInline(CallKind call_kind,
return false;
}
#if !V8_TARGET_ARCH_IA32
#if !V8_TARGET_ARCH_IA32 && !V8_TARGET_ARCH_ARM
// Target must be able to use caller's context.
CompilationInfo* outer_info = current_info();
if (target->context() != outer_info->closure()->context() ||
@ -6532,8 +6532,8 @@ bool HOptimizedGraphBuilder::TryInline(CallKind call_kind,
undefined,
function_state()->inlining_kind(),
undefined_receiver);
#if V8_TARGET_ARCH_IA32
// IA32 only, overwrite the caller's context in the deoptimization
#if V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_ARM
// IA32 and ARM only, overwrite the caller's context in the deoptimization
// environment with the correct one.
//
// TODO(kmillikin): implement the same inlining on other platforms so we