| Index: src/compiler/linkage-impl.h
|
| diff --git a/src/compiler/linkage-impl.h b/src/compiler/linkage-impl.h
|
| index 6f0159e1f1da1fffc29a4f0d5d5cc9d1807f1aa3..833cba81b1b71f486928b67e747c7a60b0b81c4f 100644
|
| --- a/src/compiler/linkage-impl.h
|
| +++ b/src/compiler/linkage-impl.h
|
| @@ -64,7 +64,7 @@ class LinkageHelper {
|
| locations, // locations
|
| Operator::kNoProperties, // properties
|
| kNoCalleeSaved, // callee-saved registers
|
| - CallDescriptor::kLazyDeoptimization); // deoptimization
|
| + CallDescriptor::kLazyDeoptimization); // flags
|
| }
|
|
|
|
|
| @@ -72,8 +72,7 @@ class LinkageHelper {
|
| template <typename LinkageTraits>
|
| static CallDescriptor* GetRuntimeCallDescriptor(
|
| Zone* zone, Runtime::FunctionId function_id, int parameter_count,
|
| - Operator::Property properties,
|
| - CallDescriptor::DeoptimizationSupport can_deoptimize) {
|
| + Operator::Property properties, CallDescriptor::Flags flags) {
|
| const int code_count = 1;
|
| const int function_count = 1;
|
| const int num_args_count = 1;
|
| @@ -119,7 +118,7 @@ class LinkageHelper {
|
| locations, // locations
|
| properties, // properties
|
| kNoCalleeSaved, // callee-saved registers
|
| - can_deoptimize, // deoptimization
|
| + flags, // flags
|
| function->name);
|
| }
|
|
|
| @@ -128,8 +127,7 @@ class LinkageHelper {
|
| template <typename LinkageTraits>
|
| static CallDescriptor* GetStubCallDescriptor(
|
| Zone* zone, CodeStubInterfaceDescriptor* descriptor,
|
| - int stack_parameter_count,
|
| - CallDescriptor::DeoptimizationSupport can_deoptimize) {
|
| + int stack_parameter_count, CallDescriptor::Flags flags) {
|
| int register_parameter_count = descriptor->GetEnvironmentParameterCount();
|
| int parameter_count = register_parameter_count + stack_parameter_count;
|
| const int code_count = 1;
|
| @@ -166,7 +164,7 @@ class LinkageHelper {
|
| locations, // locations
|
| Operator::kNoProperties, // properties
|
| kNoCalleeSaved, // callee-saved registers
|
| - can_deoptimize, // deoptimization
|
| + flags, // flags
|
| CodeStub::MajorName(descriptor->MajorKey(), false));
|
| }
|
|
|
| @@ -196,11 +194,12 @@ class LinkageHelper {
|
| return new (zone) CallDescriptor(
|
| CallDescriptor::kCallAddress, 1, num_params, num_params + 1, locations,
|
| Operator::kNoProperties, LinkageTraits::CCalleeSaveRegisters(),
|
| - CallDescriptor::kNoDeoptimization); // TODO(jarin) should deoptimize!
|
| + CallDescriptor::kNoFlags); // TODO(jarin) should deoptimize!
|
| }
|
| };
|
| -}
|
| -}
|
| -} // namespace v8::internal::compiler
|
| +
|
| +} // namespace compiler
|
| +} // namespace internal
|
| +} // namespace v8
|
|
|
| #endif // V8_COMPILER_LINKAGE_IMPL_H_
|
|
|