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

X87: Remove separate construct stub for new.target users.

Browse Source 
port e50c861b09 (r29562)

original commit message:

BUG=

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

Cr-Commit-Position: refs/heads/master@{#29631}
This commit is contained in:
chunyang.dai 2015-07-13 19:45:31 -07:00 committed by Commit bot
parent a5458c9221
commit f9d435d241
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/x87/builtins-x87.cc
View File

@ -105,12 +105,12 @@ static void Generate_Runtime_NewObject(MacroAssembler* masm,
Register original_constructor, Register original_constructor,
Label* count_incremented, Label* count_incremented,
Label* allocated) { Label* allocated) {
int offset = 0; int offset = kPointerSize;
if (create_memento) { if (create_memento) {
// Get the cell or allocation site. // Get the cell or allocation site.
__ mov(edi, Operand(esp, kPointerSize * 2)); __ mov(edi, Operand(esp, kPointerSize * 3));
__ push(edi); __ push(edi);
offset = kPointerSize; offset += kPointerSize;
} }
// Must restore esi (context) and edi (constructor) before calling // Must restore esi (context) and edi (constructor) before calling
@ -138,7 +138,6 @@ static void Generate_Runtime_NewObject(MacroAssembler* masm,
static void Generate_JSConstructStubHelper(MacroAssembler* masm, static void Generate_JSConstructStubHelper(MacroAssembler* masm,
bool is_api_function, bool is_api_function,
bool use_new_target,
bool create_memento) { bool create_memento) {
// ----------- S t a t e ------------- // ----------- S t a t e -------------
// -- eax: number of arguments // -- eax: number of arguments
@ -163,9 +162,7 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
__ SmiTag(eax); __ SmiTag(eax);
__ push(eax); __ push(eax);
__ push(edi); __ push(edi);
if (use_new_target) {
__ push(edx); __ push(edx);
}
__ cmp(edx, edi); __ cmp(edx, edi);
Label normal_new; Label normal_new;
@ -324,8 +321,7 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
__ bind(&allocated); __ bind(&allocated);
if (create_memento) { if (create_memento) {
int offset = (use_new_target ? 3 : 2) * kPointerSize; __ mov(ecx, Operand(esp, 3 * kPointerSize));
__ mov(ecx, Operand(esp, offset));
__ cmp(ecx, masm->isolate()->factory()->undefined_value()); __ cmp(ecx, masm->isolate()->factory()->undefined_value());
__ j(equal, &count_incremented); __ j(equal, &count_incremented);
// ecx is an AllocationSite. We are creating a memento from it, so we // ecx is an AllocationSite. We are creating a memento from it, so we
@ -336,9 +332,7 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
} }
// Restore the parameters. // Restore the parameters.
if (use_new_target) {
__ pop(edx); // new.target __ pop(edx); // new.target
}
__ pop(edi); // Constructor function. __ pop(edi); // Constructor function.
// Retrieve smi-tagged arguments count from the stack. // Retrieve smi-tagged arguments count from the stack.
@ -347,9 +341,7 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
// Push new.target onto the construct frame. This is stored just below the // Push new.target onto the construct frame. This is stored just below the
// receiver on the stack. // receiver on the stack.
if (use_new_target) {
__ push(edx); __ push(edx);
}
// Push the allocated receiver to the stack. We need two copies // Push the allocated receiver to the stack. We need two copies
// because we may have to return the original one and the calling // because we may have to return the original one and the calling
@ -383,9 +375,7 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
} }
// Store offset of return address for deoptimizer. // Store offset of return address for deoptimizer.
// TODO(arv): Remove the "!use_new_target" before supporting optimization if (!is_api_function) {
// of functions that reference new.target
if (!is_api_function && !use_new_target) {
masm->isolate()->heap()->SetConstructStubDeoptPCOffset(masm->pc_offset()); masm->isolate()->heap()->SetConstructStubDeoptPCOffset(masm->pc_offset());
} }
@ -413,8 +403,7 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
// Restore the arguments count and leave the construct frame. The arguments // Restore the arguments count and leave the construct frame. The arguments
// count is stored below the reciever and the new.target. // count is stored below the reciever and the new.target.
__ bind(&exit); __ bind(&exit);
int offset = (use_new_target ? 2 : 1) * kPointerSize; __ mov(ebx, Operand(esp, 2 * kPointerSize));
__ mov(ebx, Operand(esp, offset));
// Leave construct frame. // Leave construct frame.
} }
@ -430,17 +419,12 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
void Builtins::Generate_JSConstructStubGeneric(MacroAssembler* masm) { void Builtins::Generate_JSConstructStubGeneric(MacroAssembler* masm) {
Generate_JSConstructStubHelper(masm, false, false, FLAG_pretenuring_call_new); Generate_JSConstructStubHelper(masm, false, FLAG_pretenuring_call_new);
} }
void Builtins::Generate_JSConstructStubApi(MacroAssembler* masm) { void Builtins::Generate_JSConstructStubApi(MacroAssembler* masm) {
Generate_JSConstructStubHelper(masm, true, false, false); Generate_JSConstructStubHelper(masm, true, false);
}
void Builtins::Generate_JSConstructStubNewTarget(MacroAssembler* masm) {
Generate_JSConstructStubHelper(masm, false, true, FLAG_pretenuring_call_new);
} }