Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix panic when optional chain partially replaced with defines #3554

Merged
merged 5 commits into from
Dec 18, 2023
Merged

fix: fix panic when optional chain partially replaced with defines #3554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c4631b
fix: fix panic when optional chain partially replaced with defines
hi-ogawa Dec 17, 2023
8eba3c9
refactor: check childContainsOptionalChain to bail out before panic
hi-ogawa Dec 18, 2023
15279a2
chore: revert old approach
hi-ogawa Dec 18, 2023
c86c8e6
test: add more
hi-ogawa Dec 18, 2023
7e4e2d8
avoid lowering earlier if it's not needed
evanw Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions internal/bundler_tests/bundler_default_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5329,6 +5329,64 @@ func TestDefineOptionalChainLowered(t *testing.T) {
})
}

// See: https://github.com/evanw/esbuild/issues/3551
func TestDefineOptionalChainPanicIssue3551(t *testing.T) {
defines := config.ProcessDefines(map[string]config.DefineData{
"x": {
DefineExpr: &config.DefineExpr{
Constant: &js_ast.EObject{},
},
},
"a.b": {
DefineExpr: &config.DefineExpr{
Constant: &js_ast.EObject{},
},
},
})
default_suite.expectBundled(t, bundled{
files: map[string]string{
"/id-define.js": `
x?.y.z;
(x?.y).z;
x?.y["z"];
(x?.y)["z"];
x?.y();
(x?.y)();
x?.y.z();
(x?.y).z();
x?.y["z"]();
(x?.y)["z"]();
delete x?.y.z;
delete (x?.y).z;
delete x?.y["z"];
delete (x?.y)["z"];
`,
"/dot-define.js": `
a?.b.c;
(a?.b).c;
a?.b["c"];
(a?.b)["c"];
a?.b();
(a?.b)();
a?.b.c();
(a?.b).c();
a?.b["c"]();
(a?.b)["c"]();
delete a?.b.c;
delete (a?.b).c;
delete a?.b["c"];
delete (a?.b)["c"];
`,
},
entryPaths: []string{"/id-define.js", "/dot-define.js"},
options: config.Options{
Mode: config.ModeBundle,
AbsOutputDir: "/out",
Defines: &defines,
},
})
}

// See: https://github.com/evanw/esbuild/issues/2407
func TestDefineInfiniteLoopIssue2407(t *testing.T) {
defines := config.ProcessDefines(map[string]config.DefineData{
Expand Down
36 changes: 36 additions & 0 deletions internal/bundler_tests/snapshots/snapshots_default.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,6 +1081,42 @@ console.log([
(_a = a[b]) == null ? void 0 : _a[c]
]);

================================================================================
TestDefineOptionalChainPanicIssue3551
---------- /out/id-define.js ----------
// id-define.js
({})?.y.z;
({}?.y).z;
({})?.y["z"];
({}?.y)["z"];
({})?.y();
({}?.y)();
({})?.y.z();
({}?.y).z();
({})?.y["z"]();
({}?.y)["z"]();
delete {}?.y.z;
delete ({}?.y).z;
delete {}?.y["z"];
delete ({}?.y)["z"];

---------- /out/dot-define.js ----------
// dot-define.js
({}).c;
({}).c;
({})["c"];
({})["c"];
({})();
({})();
({}).c();
({}).c();
({})["c"]();
({})["c"]();
delete {}.c;
delete {}.c;
delete {}["c"];
delete {}["c"];

================================================================================
TestDefineThis
---------- /out.js ----------
Expand Down
9 changes: 6 additions & 3 deletions internal/js_parser/js_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13462,7 +13462,8 @@ func (p *parser) visitExprInOut(expr js_ast.Expr, in exprIn) (js_ast.Expr, exprO
}

// Lower optional chaining if we're the top of the chain
containsOptionalChain := e.OptionalChain != js_ast.OptionalChainNone
containsOptionalChain := e.OptionalChain == js_ast.OptionalChainStart ||
(e.OptionalChain == js_ast.OptionalChainContinue && out.childContainsOptionalChain)
if containsOptionalChain && !in.hasChainParent {
return p.lowerOptionalChain(expr, in, out)
}
Expand Down Expand Up @@ -13620,7 +13621,8 @@ func (p *parser) visitExprInOut(expr js_ast.Expr, in exprIn) (js_ast.Expr, exprO
}

// Lower optional chaining if we're the top of the chain
containsOptionalChain := e.OptionalChain != js_ast.OptionalChainNone
containsOptionalChain := e.OptionalChain == js_ast.OptionalChainStart ||
(e.OptionalChain == js_ast.OptionalChainContinue && out.childContainsOptionalChain)
if containsOptionalChain && !in.hasChainParent {
return p.lowerOptionalChain(expr, in, out)
}
Expand Down Expand Up @@ -14718,7 +14720,8 @@ func (p *parser) visitExprInOut(expr js_ast.Expr, in exprIn) (js_ast.Expr, exprO
}

// Lower optional chaining if we're the top of the chain
containsOptionalChain := e.OptionalChain != js_ast.OptionalChainNone
containsOptionalChain := e.OptionalChain == js_ast.OptionalChainStart ||
(e.OptionalChain == js_ast.OptionalChainContinue && out.childContainsOptionalChain)
if containsOptionalChain && !in.hasChainParent {
return p.lowerOptionalChain(expr, in, out)
}
Expand Down