diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h index 0101d1257665..8d2e7f417716 100644 --- a/deps/v8/include/v8-version.h +++ b/deps/v8/include/v8-version.h @@ -11,7 +11,7 @@ #define V8_MAJOR_VERSION 15 #define V8_MINOR_VERSION 6 #define V8_BUILD_NUMBER 75 -#define V8_PATCH_LEVEL 50 +#define V8_PATCH_LEVEL 60 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/deps/v8/src/baseline/baseline-compiler.cc b/deps/v8/src/baseline/baseline-compiler.cc index b09ed33e0085..b45a1942ac9f 100644 --- a/deps/v8/src/baseline/baseline-compiler.cc +++ b/deps/v8/src/baseline/baseline-compiler.cc @@ -1882,27 +1882,25 @@ void BaselineCompiler::VisitIntrinsicAsyncFunctionResolve( void BaselineCompiler::VisitIntrinsicGeneratorYieldResult( interpreter::RegisterList args) { - Register value = WriteBarrierDescriptor::ValueRegister(); Register generator = WriteBarrierDescriptor::ObjectRegister(); - DCHECK(!AreAliased(value, generator, kInterpreterAccumulatorRegister)); + DCHECK(!AreAliased(generator, kInterpreterAccumulatorRegister)); Label allocate, done; __ LoadRegister(generator, args[1]); // generator - // Check whether the generator user asked to skip result allocation - // (yielded_value_ == TheHole). + // Check whether the caller asked to skip result allocation + // (resume_mode_ == kNextTrySkipAlloc). __ LoadTaggedField(kInterpreterAccumulatorRegister, generator, - offsetof(JSGeneratorObject, yielded_value_)); - __ JumpIfNotRoot(kInterpreterAccumulatorRegister, RootIndex::kTheHoleValue, - &allocate); - - // Skip allocation: store value into yielded_value_. - __ LoadRegister(value, args[0]); // value - __ StoreTaggedFieldWithWriteBarrier( - generator, offsetof(JSGeneratorObject, yielded_value_), value); - - __ LoadRoot(kInterpreterAccumulatorRegister, RootIndex::kTheHoleValue); + offsetof(JSGeneratorObject, resume_mode_)); + __ JumpIfSmi(kNotEqual, kInterpreterAccumulatorRegister, + Smi::FromInt(JSGeneratorObject::kNextTrySkipAlloc), &allocate); + + // Skip allocation: ack handshake and return bare value. + __ StoreTaggedSignedField(generator, + offsetof(JSGeneratorObject, resume_mode_), + Smi::FromInt(JSGeneratorObject::kNextAllocSkipped)); + __ LoadRegister(kInterpreterAccumulatorRegister, args[0]); // value __ Jump(&done); __ Bind(&allocate); diff --git a/deps/v8/src/builtins/builtins-generator-gen.cc b/deps/v8/src/builtins/builtins-generator-gen.cc index c407accc24ac..cce7df4fe5ee 100644 --- a/deps/v8/src/builtins/builtins-generator-gen.cc +++ b/deps/v8/src/builtins/builtins-generator-gen.cc @@ -122,6 +122,10 @@ void GeneratorBuiltinsAssembler::InnerResume( case JSGeneratorObject::kRethrow: // Currently only async generators use this mode. UNREACHABLE(); + case JSGeneratorObject::kNextTrySkipAlloc: + case JSGeneratorObject::kNextAllocSkipped: + // Handshake states only set by optimized callers or the generator body. + UNREACHABLE(); } args->PopAndReturn(builtin_result); } diff --git a/deps/v8/src/builtins/generator.tq b/deps/v8/src/builtins/generator.tq index 8f8fd2d5c97f..44cbd2a45ee1 100644 --- a/deps/v8/src/builtins/generator.tq +++ b/deps/v8/src/builtins/generator.tq @@ -19,8 +19,6 @@ transitioning javascript builtin GeneratorPrototypeNextLazyDeoptContinuation( js-implicit context: NativeContext, receiver: JSAny)(generator: JSAny, exception: JSAny|TheHole, result: JSAny): JSAny { const gen = UnsafeCast(generator); - const yieldedValue = gen.yielded_value; - gen.yielded_value = Undefined; // Exception path: close the generator and rethrow. typeswitch (exception) { @@ -36,15 +34,13 @@ transitioning javascript builtin GeneratorPrototypeNextLazyDeoptContinuation( // continuation is now kGeneratorExecuting; close it and wrap the result. // Otherwise (yielded), return the result as-is. if (gen.continuation == SmiConstant(kGeneratorExecuting)) { - dcheck(result != TheHole); gen.continuation = SmiConstant(kGeneratorClosed); return AllocateJSIteratorResult(result, True); } // Allocating the iterator result object was skipped; allocate it here. - if (result == TheHole) { - const val = (yieldedValue == TheHole) ? Undefined : yieldedValue; - return AllocateJSIteratorResult(val, False); + if (gen.resume_mode == SmiConstant(kGeneratorResumeModeNextAllocSkipped)) { + return AllocateJSIteratorResult(result, False); } return result; diff --git a/deps/v8/src/codegen/compiler.cc b/deps/v8/src/codegen/compiler.cc index 7a965c17292a..378a43860dfd 100644 --- a/deps/v8/src/codegen/compiler.cc +++ b/deps/v8/src/codegen/compiler.cc @@ -2177,6 +2177,11 @@ class ConstantPoolPointerForwarder { } } + bool HasScopeInfoToUpdate(Tagged scope_info) const { + return scope_infos_to_update_.find(scope_info->UniqueIdInScript()) != + scope_infos_to_update_.end(); + } + void UpdateStandaloneScopeInfo(Tagged scope_info) { if (!scope_info->HasOuterScopeInfo()) return; @@ -2354,6 +2359,23 @@ void VerifyCodeMerge(Isolate* isolate, DirectHandle