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

Jump to bottom

feat(es/minifier): mark some builtin functions pure. #6842

Draft
wants to merge 16 commits into
base: main
Choose a base branch
from
+903 −10
Draft

feat(es/minifier): mark some builtin functions pure. #6842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3b8f5ca
perf(es/minifier): check whether a function is pure with O(1) cost
hyf0 Jan 20, 2023
03a1521
Clippy
hyf0 Jan 20, 2023
017a12b
Clippy
hyf0 Jan 20, 2023
be7beb7
impl Hash
hyf0 Jan 20, 2023
5ef8415
Clippy
hyf0 Jan 20, 2023
62fe5c3
Add test and remove println
hyf0 Jan 21, 2023
8af93ae
Tests
hyf0 Jan 21, 2023
7aaad6a
More tests
hyf0 Jan 21, 2023
2425173
Make PURE_FUNC_LIST
hyf0 Jan 21, 2023
3e43d65
Merge branch 'hyf_improve_minifier_hello_today' into hyf_happy_new_year
hyf0 Jan 21, 2023
48d8da5
Impl
hyf0 Jan 21, 2023
43164e0
Clippy
hyf0 Jan 21, 2023
1c3a70c
Add tests
hyf0 Jan 21, 2023
26a6dfa
methods of `console` shouldn't be considered as pure
hyf0 Jan 22, 2023
4f20df4
Merge branch 'main' into hyf_happy_new_year
hyf0 Jan 24, 2023
a7725c5
Format
hyf0 Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 25 additions & 10 deletions crates/swc_ecma_minifier/src/metadata/mod.rs
View file
Open in desktop
Expand Up @@ -14,6 +14,8 @@ use swc_ecma_visit::{

use crate::option::CompressOptions;

mod pure_exprs;

#[derive(Debug, Eq)]
struct HashEqIgnoreSpanExprRef<'a>(&'a Expr);

Expand Down Expand Up @@ -55,13 +57,24 @@ pub(crate) fn info_marker<'a>(
marks: Marks,
// unresolved_mark: Mark,
) -> impl 'a + VisitMut {
let pure_funcs = options.map(|options| {
options
.pure_funcs
.iter()
.map(|f| HashEqIgnoreSpanExprRef(f))
.collect()
});
let pristine_globals = options.map_or(false, |opts| opts.pristine_globals);
let mut pure_funcs = options
.map(|opts| {
opts.pure_funcs
.iter()
.map(|expr| HashEqIgnoreSpanExprRef(expr))
.collect::<FxHashSet<_>>()
})
.unwrap_or_default();

if pristine_globals {
pure_funcs.extend(
pure_exprs::PURE_FUNC_LIST
.iter()
.map(|expr| HashEqIgnoreSpanExprRef(expr)),
);
}

InfoMarker {
options,
comments,
Expand All @@ -81,7 +94,7 @@ struct State {
struct InfoMarker<'a> {
#[allow(dead_code)]
options: Option<&'a CompressOptions>,
pure_funcs: Option<FxHashSet<HashEqIgnoreSpanExprRef<'a>>>,
pure_funcs: FxHashSet<HashEqIgnoreSpanExprRef<'a>>,
comments: Option<&'a dyn Comments>,
marks: Marks,
// unresolved_mark: Mark,
Expand Down Expand Up @@ -167,10 +180,12 @@ impl VisitMut for InfoMarker<'_> {

if self.has_pure(n.span) {
n.span = n.span.apply_mark(self.marks.pure);
} else if let Some(pure_fns) = &self.pure_funcs {
}

if !self.pure_funcs.is_empty() {
if let Callee::Expr(e) = &n.callee {
// Check for pure_funcs
if pure_fns.contains(&HashEqIgnoreSpanExprRef(e)) {
if self.pure_funcs.contains(&HashEqIgnoreSpanExprRef(e)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use two hashset instead?
I think it will avoid allocations

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One hashset with type Lazy<FxHashSet<HashEqIgnoreSpanExprRef<'static>>>

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Get it.

n.span = n.span.apply_mark(self.marks.pure);
};
}
Expand Down