Skip to content

Commit 27aa4d1

Browse files
committed
Don't pass in enclosing
1 parent eb29216 commit 27aa4d1

1 file changed

Lines changed: 4 additions & 24 deletions

File tree

packages/react-server/src/ReactFlightServer.js

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -206,16 +206,7 @@ function findCalledFunctionNameFromStackTrace(
206206
const url = devirtualizeURL(callsite[1]);
207207
const lineNumber = callsite[2];
208208
const columnNumber = callsite[3];
209-
const enclosingLineNumber = callsite[4];
210-
const enclosingColumnNumber = callsite[5];
211-
if (
212-
filterStackFrame(
213-
url,
214-
functionName,
215-
enclosingLineNumber || lineNumber,
216-
enclosingColumnNumber || columnNumber,
217-
)
218-
) {
209+
if (filterStackFrame(url, functionName, lineNumber, columnNumber)) {
219210
if (bestMatch === '') {
220211
// If we had no good stack frames for internal calls, just use the last
221212
// first party function name.
@@ -248,17 +239,8 @@ function filterStackTrace(
248239
const functionName = callsite[0];
249240
const lineNumber = callsite[2];
250241
const columnNumber = callsite[3];
251-
const enclosingLineNumber = callsite[4];
252-
const enclosingColumnNumber = callsite[5];
253242
const url = devirtualizeURL(callsite[1]);
254-
if (
255-
filterStackFrame(
256-
url,
257-
functionName,
258-
enclosingLineNumber || lineNumber,
259-
enclosingColumnNumber || columnNumber,
260-
)
261-
) {
243+
if (filterStackFrame(url, functionName, lineNumber, columnNumber)) {
262244
// Use a clone because the Flight protocol isn't yet resilient to deduping
263245
// objects in the debug info. TODO: Support deduping stacks.
264246
const clone: ReactCallSite = (callsite.slice(0): any);
@@ -2201,13 +2183,11 @@ function visitAsyncNode(
22012183
const url = devirtualizeURL(callsite[1]);
22022184
const lineNumber = callsite[2];
22032185
const columnNumber = callsite[3];
2204-
const enclosingLineNumber = callsite[4];
2205-
const enclosingColumnNumber = callsite[5];
22062186
isAwaitInUserspace = filterStackFrame(
22072187
url,
22082188
functionName,
2209-
enclosingLineNumber || lineNumber,
2210-
enclosingColumnNumber || columnNumber,
2189+
lineNumber,
2190+
columnNumber,
22112191
);
22122192
}
22132193
if (!isAwaitInUserspace) {

0 commit comments

Comments
 (0)