From e6430e577f105ad8813c92e75c54660c4985026e Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 18 Sep 2017 14:34:04 +0200 Subject: BASELINE: Update Chromium to 61.0.3163.99 Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367 Reviewed-by: Alexandru Croitor --- .../interpreter-intrinsics-generator.cc | 53 +++++++--------------- 1 file changed, 17 insertions(+), 36 deletions(-) (limited to 'chromium/v8/src/interpreter/interpreter-intrinsics-generator.cc') diff --git a/chromium/v8/src/interpreter/interpreter-intrinsics-generator.cc b/chromium/v8/src/interpreter/interpreter-intrinsics-generator.cc index e8572ba1d4f..8c2c919a524 100644 --- a/chromium/v8/src/interpreter/interpreter-intrinsics-generator.cc +++ b/chromium/v8/src/interpreter/interpreter-intrinsics-generator.cc @@ -202,21 +202,11 @@ Node* IntrinsicsGenerator::IsJSMap(Node* input, Node* arg_count, return IsInstanceType(input, JS_MAP_TYPE); } -Node* IntrinsicsGenerator::IsJSMapIterator(Node* input, Node* arg_count, - Node* context) { - return IsInstanceType(input, JS_MAP_ITERATOR_TYPE); -} - Node* IntrinsicsGenerator::IsJSSet(Node* input, Node* arg_count, Node* context) { return IsInstanceType(input, JS_SET_TYPE); } -Node* IntrinsicsGenerator::IsJSSetIterator(Node* input, Node* arg_count, - Node* context) { - return IsInstanceType(input, JS_SET_ITERATOR_TYPE); -} - Node* IntrinsicsGenerator::IsJSWeakMap(Node* input, Node* arg_count, Node* context) { return IsInstanceType(input, JS_WEAK_MAP_TYPE); @@ -276,14 +266,15 @@ Node* IntrinsicsGenerator::IntrinsicAsBuiltinCall(Node* input, Node* context, Node* IntrinsicsGenerator::CreateIterResultObject(Node* input, Node* arg_count, Node* context) { - return IntrinsicAsStubCall(input, context, - CodeFactory::CreateIterResultObject(isolate())); + return IntrinsicAsStubCall( + input, context, + Builtins::CallableFor(isolate(), Builtins::kCreateIterResultObject)); } Node* IntrinsicsGenerator::HasProperty(Node* input, Node* arg_count, Node* context) { - return IntrinsicAsStubCall(input, context, - CodeFactory::HasProperty(isolate())); + return IntrinsicAsStubCall( + input, context, Builtins::CallableFor(isolate(), Builtins::kHasProperty)); } Node* IntrinsicsGenerator::SubString(Node* input, Node* arg_count, @@ -293,27 +284,32 @@ Node* IntrinsicsGenerator::SubString(Node* input, Node* arg_count, Node* IntrinsicsGenerator::ToString(Node* input, Node* arg_count, Node* context) { - return IntrinsicAsStubCall(input, context, CodeFactory::ToString(isolate())); + return IntrinsicAsStubCall( + input, context, Builtins::CallableFor(isolate(), Builtins::kToString)); } Node* IntrinsicsGenerator::ToLength(Node* input, Node* arg_count, Node* context) { - return IntrinsicAsStubCall(input, context, CodeFactory::ToLength(isolate())); + return IntrinsicAsStubCall( + input, context, Builtins::CallableFor(isolate(), Builtins::kToLength)); } Node* IntrinsicsGenerator::ToInteger(Node* input, Node* arg_count, Node* context) { - return IntrinsicAsStubCall(input, context, CodeFactory::ToInteger(isolate())); + return IntrinsicAsStubCall( + input, context, Builtins::CallableFor(isolate(), Builtins::kToInteger)); } Node* IntrinsicsGenerator::ToNumber(Node* input, Node* arg_count, Node* context) { - return IntrinsicAsStubCall(input, context, CodeFactory::ToNumber(isolate())); + return IntrinsicAsStubCall( + input, context, Builtins::CallableFor(isolate(), Builtins::kToNumber)); } Node* IntrinsicsGenerator::ToObject(Node* input, Node* arg_count, Node* context) { - return IntrinsicAsStubCall(input, context, CodeFactory::ToObject(isolate())); + return IntrinsicAsStubCall( + input, context, Builtins::CallableFor(isolate(), Builtins::kToObject)); } Node* IntrinsicsGenerator::Call(Node* args_reg, Node* arg_count, @@ -339,7 +335,7 @@ Node* IntrinsicsGenerator::Call(Node* args_reg, Node* arg_count, } Node* result = __ CallJS(function, context, receiver_arg, target_args_count, - ConvertReceiverMode::kAny, TailCallMode::kDisallow); + ConvertReceiverMode::kAny); return result; } @@ -387,18 +383,6 @@ Node* IntrinsicsGenerator::CreateAsyncFromSyncIterator(Node* args_reg, return return_value.value(); } -Node* IntrinsicsGenerator::AsyncGeneratorGetAwaitInputOrDebugPos( - Node* args_reg, Node* arg_count, Node* context) { - Node* generator = __ LoadRegister(args_reg); - CSA_SLOW_ASSERT(assembler_, __ HasInstanceType( - generator, JS_ASYNC_GENERATOR_OBJECT_TYPE)); - - Node* const value = __ LoadObjectField( - generator, JSAsyncGeneratorObject::kAwaitInputOrDebugPosOffset); - - return value; -} - Node* IntrinsicsGenerator::CreateJSGeneratorObject(Node* input, Node* arg_count, Node* context) { return IntrinsicAsBuiltinCall(input, context, @@ -437,13 +421,10 @@ Node* IntrinsicsGenerator::GeneratorGetResumeMode(Node* args_reg, Node* IntrinsicsGenerator::GeneratorClose(Node* args_reg, Node* arg_count, Node* context) { Node* generator = __ LoadRegister(args_reg); - Node* const value = - __ LoadObjectField(generator, JSGeneratorObject::kResumeModeOffset); __ StoreObjectFieldNoWriteBarrier( generator, JSGeneratorObject::kContinuationOffset, __ SmiConstant(JSGeneratorObject::kGeneratorClosed)); - - return value; + return __ UndefinedConstant(); } Node* IntrinsicsGenerator::AsyncGeneratorReject(Node* input, Node* arg_count, -- cgit v1.2.1