resolve rebase conflicts

nodejs · Apr 10, 2024 · 9f7bb00 · 9f7bb00
1 parent 2954732
commit 9f7bb00
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -1065,7 +1065,11 @@ Module._load = function(request, parent, isMain) {
       // to determine if it's loading or not.
       const importedCJSMetadata = importedCJSCache.get(cachedModule);
       if (importedCJSMetadata.loading) {
-        return getExportsForCircularRequire(cachedModule);
+        const result = getExportsForCircularRequire(cachedModule);
+
+        endTimer(logLabel, traceLabel);
+
+        return result;
       }
       importedCJSMetadata.loading = true;
     } else {