diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/v8/src/compiler/linkage.cc | |
parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
download | qtwebengine-chromium-85-based.tar.gz |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/v8/src/compiler/linkage.cc')
-rw-r--r-- | chromium/v8/src/compiler/linkage.cc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/chromium/v8/src/compiler/linkage.cc b/chromium/v8/src/compiler/linkage.cc index e16290f2a11..08ab34a892e 100644 --- a/chromium/v8/src/compiler/linkage.cc +++ b/chromium/v8/src/compiler/linkage.cc @@ -180,7 +180,7 @@ bool Linkage::NeedsFrameStateInput(Runtime::FunctionId function) { switch (function) { // Most runtime functions need a FrameState. A few chosen ones that we know // not to call into arbitrary JavaScript, not to throw, and not to lazily - // deoptimize are whitelisted here and can be called without a FrameState. + // deoptimize are allowlisted here and can be called without a FrameState. case Runtime::kAbort: case Runtime::kAllocateInOldGeneration: case Runtime::kCreateIterResultObject: @@ -218,7 +218,7 @@ bool Linkage::NeedsFrameStateInput(Runtime::FunctionId function) { break; } - // For safety, default to needing a FrameState unless whitelisted. + // For safety, default to needing a FrameState unless allowlisted. return true; } @@ -253,7 +253,7 @@ CallDescriptor* Linkage::GetRuntimeCallDescriptor( CallDescriptor* Linkage::GetCEntryStubCallDescriptor( Zone* zone, int return_count, int js_parameter_count, const char* debug_name, Operator::Properties properties, - CallDescriptor::Flags flags) { + CallDescriptor::Flags flags, StackArgumentOrder stack_order) { const size_t function_count = 1; const size_t num_args_count = 1; const size_t context_count = 1; @@ -305,7 +305,8 @@ CallDescriptor* Linkage::GetCEntryStubCallDescriptor( kNoCalleeSaved, // callee-saved kNoCalleeSaved, // callee-saved fp flags, // flags - debug_name); // debug name + debug_name, // debug name + stack_order); // stack order } CallDescriptor* Linkage::GetJSCallDescriptor(Zone* zone, bool is_osr, @@ -325,7 +326,11 @@ CallDescriptor* Linkage::GetJSCallDescriptor(Zone* zone, bool is_osr, // All parameters to JS calls go on the stack. for (int i = 0; i < js_parameter_count; i++) { +#ifdef V8_REVERSE_JSARGS + int spill_slot_index = -i - 1; +#else int spill_slot_index = i - js_parameter_count; +#endif locations.AddParam(LinkageLocation::ForCallerFrameSlot( spill_slot_index, MachineType::AnyTagged())); } @@ -358,7 +363,8 @@ CallDescriptor* Linkage::GetJSCallDescriptor(Zone* zone, bool is_osr, kNoCalleeSaved, // callee-saved kNoCalleeSaved, // callee-saved fp flags, // flags - "js-call"); + "js-call", // debug name + StackArgumentOrder::kJS); // stack order } // TODO(turbofan): cache call descriptors for code stub calls. @@ -458,6 +464,7 @@ CallDescriptor* Linkage::GetStubCallDescriptor( kNoCalleeSaved, // callee-saved fp CallDescriptor::kCanUseRoots | flags, // flags descriptor.DebugName(), // debug name + descriptor.GetStackArgumentOrder(), // stack order descriptor.allocatable_registers()); } |