Commit d248639
committed
src: use supported API to get stalled TLA messages
Refs: v8/v8@23e3b6f
PR-URL: #51362
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>1 parent d34b02d commit d248639
1 file changed
Lines changed: 9 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -122,15 +122,15 @@ v8::Maybe<bool> ModuleWrap::CheckUnsettledTopLevelAwait() { | |||
| 122 | 122 | if (!module->IsGraphAsync()) { // There is no TLA, no need to check. | |
| 123 | 123 | return v8::Just(true); | |
| 124 | 124 | } | |
| 125 | - auto stalled = module->GetStalledTopLevelAwaitMessage(isolate); | ||
| 126 | - if (stalled.size() == 0) { | ||
| 125 | + | ||
| 126 | + auto stalled_messages = | ||
| 127 | + std::get<1>(module->GetStalledTopLevelAwaitMessages(isolate)); | ||
| 128 | + if (stalled_messages.size() == 0) { | ||
| 127 | 129 | return v8::Just(true); | |
| 128 | 130 | } | |
| 129 | 131 | ||
| 130 | 132 | if (env()->options()->warnings) { | |
| 131 | - for (auto& pair : stalled) { | ||
| 132 | - Local<v8::Message> message = std::get<1>(pair); | ||
| 133 | - | ||
| 133 | + for (auto& message : stalled_messages) { | ||
| 134 | 134 | std::string reason = "Warning: Detected unsettled top-level await at "; | |
| 135 | 135 | std::string info = | |
| 136 | 136 | FormatErrorMessage(isolate, context, "", message, true); | |
@@ -614,11 +614,10 @@ void ModuleWrap::EvaluateSync(const FunctionCallbackInfo<Value>& args) { | |||
| 614 | 614 | ||
| 615 | 615 | if (module->IsGraphAsync()) { | |
| 616 | 616 | CHECK(env->options()->print_required_tla); | |
| 617 | - auto stalled = module->GetStalledTopLevelAwaitMessage(isolate); | ||
| 618 | - if (stalled.size() != 0) { | ||
| 619 | - for (auto pair : stalled) { | ||
| 620 | - Local<v8::Message> message = std::get<1>(pair); | ||
| 621 | - | ||
| 617 | + auto stalled_messages = | ||
| 618 | + std::get<1>(module->GetStalledTopLevelAwaitMessages(isolate)); | ||
| 619 | + if (stalled_messages.size() != 0) { | ||
| 620 | + for (auto& message : stalled_messages) { | ||
| 622 | 621 | std::string reason = "Error: unexpected top-level await at "; | |
| 623 | 622 | std::string info = | |
| 624 | 623 | FormatErrorMessage(isolate, context, "", message, true); | |
0 commit comments