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

Unified Diff: src/builtins/arm/builtins-arm.cc

Issue 2212343002: Revert of [Interpreter] Collect type feedback for 'new' in the bytecode handler (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 4 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/arm64/interface-descriptors-arm64.cc ('k') | src/builtins/arm64/builtins-arm64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/builtins/arm/builtins-arm.cc
diff --git a/src/builtins/arm/builtins-arm.cc b/src/builtins/arm/builtins-arm.cc
index 515c8a63b1d0f6413e681083aea4d9a0d18cc5d3..e0bb922ecc57953b8efbaaf15f49bd7add337dc0 100644
--- a/src/builtins/arm/builtins-arm.cc
+++ b/src/builtins/arm/builtins-arm.cc
@@ -1189,7 +1189,6 @@
__ mov(r3, Operand(r3, LSL, kPointerSizeLog2));
__ sub(r3, r2, r3);
- // TODO(mythria): Add a stack check before pushing arguments.
// Push the arguments.
Generate_InterpreterPushArgs(masm, r2, r3, r4);
@@ -1207,44 +1206,27 @@
}
// static
-void Builtins::Generate_InterpreterPushArgsAndConstructImpl(
- MacroAssembler* masm, CallableType construct_type) {
+void Builtins::Generate_InterpreterPushArgsAndConstruct(MacroAssembler* masm) {
// ----------- S t a t e -------------
// -- r0 : argument count (not including receiver)
// -- r3 : new target
// -- r1 : constructor to call
- // -- r2 : allocation site feedback if available, undefined otherwise.
- // -- r4 : address of the first argument
+ // -- r2 : address of the first argument
// -----------------------------------
// Find the address of the last argument.
- __ mov(r5, Operand(r0, LSL, kPointerSizeLog2));
- __ sub(r5, r4, r5);
+ __ mov(r4, Operand(r0, LSL, kPointerSizeLog2));
+ __ sub(r4, r2, r4);
// Push a slot for the receiver to be constructed.
__ mov(ip, Operand::Zero());
__ push(ip);
- // TODO(mythria): Add a stack check before pushing arguments.
// Push the arguments.
- Generate_InterpreterPushArgs(masm, r4, r5, r6);
-
- __ AssertUndefinedOrAllocationSite(r2, r5);
- if (construct_type == CallableType::kJSFunction) {
- __ AssertFunction(r1);
-
- // Tail call to the function-specific construct stub (still in the caller
- // context at this point).
- __ ldr(r4, FieldMemOperand(r1, JSFunction::kSharedFunctionInfoOffset));
- __ ldr(r4, FieldMemOperand(r4, SharedFunctionInfo::kConstructStubOffset));
- // Jump to the construct function.
- __ add(pc, r4, Operand(Code::kHeaderSize - kHeapObjectTag));
-
- } else {
- DCHECK_EQ(construct_type, CallableType::kAny);
- // Call the constructor with r0, r1, and r3 unmodified.
- __ Jump(masm->isolate()->builtins()->Construct(), RelocInfo::CODE_TARGET);
- }
+ Generate_InterpreterPushArgs(masm, r2, r4, r5);
+
+ // Call the constructor with r0, r1, and r3 unmodified.
+ __ Jump(masm->isolate()->builtins()->Construct(), RelocInfo::CODE_TARGET);
}
void Builtins::Generate_InterpreterEnterBytecodeDispatch(MacroAssembler* masm) {
« no previous file with comments | « src/arm64/interface-descriptors-arm64.cc ('k') | src/builtins/arm64/builtins-arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698