Revert "Improve reliability of owner stacks for async I/O errors (#81501)"

This reverts commit 465c221.

Author: unstubbable

packages/next/src/server/lib/patch-fetch.ts

@@ -559,7 +559,7 @@ export function createPatchedFetcher(
                 cacheSignal = null
               }
 
-              return await makeHangingPromise<Response>(
+              return makeHangingPromise<Response>(
                 workUnitStore.renderSignal,
                 'fetch()'
               )
@@ -669,7 +669,7 @@ export function createPatchedFetcher(
                     cacheSignal.endRead()
                     cacheSignal = null
                   }
-                  return await makeHangingPromise<Response>(
+                  return makeHangingPromise<Response>(
                     workUnitStore.renderSignal,
                     'fetch()'
                   )
@@ -1010,7 +1010,7 @@ export function createPatchedFetcher(
                     cacheSignal.endRead()
                     cacheSignal = null
                   }
-                  return await makeHangingPromise<Response>(
+                  return makeHangingPromise<Response>(
                     workUnitStore.renderSignal,
                     'fetch()'
                   )
@@ -1044,7 +1044,7 @@ export function createPatchedFetcher(
                 switch (workUnitStore.type) {
                   case 'prerender':
                   case 'prerender-client':
-                    return await makeHangingPromise<Response>(
+                    return makeHangingPromise<Response>(
                       workUnitStore.renderSignal,
                       'fetch()'
                     )

packages/next/src/server/use-cache/use-cache-wrapper.ts

@@ -821,7 +821,7 @@ export function cache(
             )
 
             if (dynamicAccessAbortController.signal.aborted) {
-              return await makeHangingPromise(
+              return makeHangingPromise(
                 workUnitStore.renderSignal,
                 dynamicAccessAbortController.signal.reason.message
               )
@@ -886,7 +886,7 @@ export function cache(
                 if (cacheSignal) {
                   cacheSignal.endRead()
                 }
-                return await makeHangingPromise(
+                return makeHangingPromise(
                   workUnitStore.renderSignal,
                   'dynamic "use cache"'
                 )
@@ -935,7 +935,7 @@ export function cache(
                 // transformed with an async function, before being passed into
                 // the "use cache" function, which escapes the instrumentation.
                 if (workUnitStore.allowEmptyStaticShell) {
-                  return await makeHangingPromise(
+                  return makeHangingPromise(
                     workUnitStore.renderSignal,
                     'dynamic "use cache"'
                   )
@@ -1030,7 +1030,7 @@ export function cache(
               if (cacheSignal) {
                 cacheSignal.endRead()
               }
-              return await makeHangingPromise(
+              return makeHangingPromise(
                 workUnitStore.renderSignal,
                 'dynamic "use cache"'
               )
@@ -1087,7 +1087,7 @@ export function cache(
           )
 
           if (result.type === 'prerender-dynamic') {
-            return await result.hangingPromise
+            return result.hangingPromise
           }
 
           const { stream: newStream, pendingCacheEntry } = result

test/e2e/app-dir/cache-components-errors/cache-components-errors.test.ts

@@ -554,11 +554,10 @@ describe('Cache Components Errors', () => {
                  "description": "Route "/dynamic-root": A component accessed data, headers, params, searchParams, or a short-lived cache without a Suspense boundary nor a "use cache" above it. See more info: https://nextjs.org/docs/messages/next-prerender-missing-suspense",
                  "environmentLabel": "Server",
                  "label": "Console Error",
-                 "source": "app/dynamic-root/page.tsx (59:26) @ fetchRandom
-             > 59 |   const response = await fetch(
-                  |                          ^",
+                 "source": "app/dynamic-root/page.tsx (45:56) @ FetchingComponent
+             > 45 |       {cached ? await fetchRandomCached(nonce) : await fetchRandom(nonce)}
+                  |                                                        ^",
                  "stack": [
-                   "fetchRandom app/dynamic-root/page.tsx (59:26)",
                    "FetchingComponent app/dynamic-root/page.tsx (45:56)",
                    "Page app/dynamic-root/page.tsx (22:9)",
                    "LogSafely <anonymous>",
@@ -568,11 +567,10 @@ describe('Cache Components Errors', () => {
                  "description": "Route "/dynamic-root": A component accessed data, headers, params, searchParams, or a short-lived cache without a Suspense boundary nor a "use cache" above it. See more info: https://nextjs.org/docs/messages/next-prerender-missing-suspense",
                  "environmentLabel": "Server",
                  "label": "Console Error",
-                 "source": "app/dynamic-root/page.tsx (59:26) @ fetchRandom
-             > 59 |   const response = await fetch(
-                  |                          ^",
+                 "source": "app/dynamic-root/page.tsx (45:56) @ FetchingComponent
+             > 45 |       {cached ? await fetchRandomCached(nonce) : await fetchRandom(nonce)}
+                  |                                                        ^",
                  "stack": [
-                   "fetchRandom app/dynamic-root/page.tsx (59:26)",
                    "FetchingComponent app/dynamic-root/page.tsx (45:56)",
                    "Page app/dynamic-root/page.tsx (27:7)",
                    "LogSafely <anonymous>",