diff --git a/src/module_wrap.cc b/src/module_wrap.cc index 92b34f5a8b99c2..deb70441309640 100644 --- a/src/module_wrap.cc +++ b/src/module_wrap.cc @@ -122,15 +122,14 @@ v8::Maybe ModuleWrap::CheckUnsettledTopLevelAwait() { if (!module->IsGraphAsync()) { // There is no TLA, no need to check. return v8::Just(true); } - auto stalled = module->GetStalledTopLevelAwaitMessage(isolate); - if (stalled.size() == 0) { + auto stalled = module->GetStalledTopLevelAwaitMessages(isolate); + auto stalled_messages = std::get<1>(stalled); + if (stalled_messages.size() == 0) { return v8::Just(true); } if (env()->options()->warnings) { - for (auto pair : stalled) { - Local message = std::get<1>(pair); - + for (auto message : stalled_messages) { std::string reason = "Warning: Detected unsettled top-level await at "; std::string info = FormatErrorMessage(isolate, context, "", message, true); @@ -614,11 +613,10 @@ void ModuleWrap::EvaluateSync(const FunctionCallbackInfo& args) { if (module->IsGraphAsync()) { CHECK(env->options()->print_required_tla); - auto stalled = module->GetStalledTopLevelAwaitMessage(isolate); - if (stalled.size() != 0) { - for (auto pair : stalled) { - Local message = std::get<1>(pair); - + auto stalled = module->GetStalledTopLevelAwaitMessages(isolate); + auto stalled_messages = std::get<1>(stalled); + if (stalled_messages.size() != 0) { + for (auto message : stalled_messages) { std::string reason = "Error: unexpected top-level await at "; std::string info = FormatErrorMessage(isolate, context, "", message, true);