fix(es): Fix a crash related to source map (#7307)

**Related issue:** - Reverts #7229. - Closes #7301.
swc-project · Apr 21, 2023 · e7f7b01 · e7f7b01 · github-actions · Apr 21, 2023
1 parent c8e6774
commit e7f7b01
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/swc_cli/src/commands/compile.rs b/bindings/swc_cli/src/commands/compile.rs
@@ -545,8 +545,10 @@ fn extend_source_map(
     let mut source_map = sourcemap::SourceMap::from_reader(source_map.as_bytes())
         .context("failed to encode source map")?;
 
-    if let Some(ref source_file_name) = source_file_name {
-        source_map.set_source(0u32, source_file_name);
+    if !source_map.get_token_count() != 0 {
+        if let Some(ref source_file_name) = source_file_name {
+            source_map.set_source(0u32, source_file_name);
+        }
     }
 
     if source_root.is_some() {

diff --git a/crates/swc/src/lib.rs b/crates/swc/src/lib.rs
@@ -558,7 +558,7 @@ impl Compiler {
 
             let (code, map) = match source_map {
                 SourceMapsConfig::Bool(v) => {
-                    if v && !src_map_buf.is_empty() {
+                    if v {
                         let mut buf = vec![];
 
                         self.cm
Benchmark suite	Current: `e7f7b01`	Previous: `38dfb91`	Ratio
`es/full/bugs-1`	`300235` ns/iter (`± 8913`)	`298279` ns/iter (`± 9991`)	`1.01`
`es/full/minify/libraries/antd`	`1530352906` ns/iter (`± 19414193`)	`1534083898` ns/iter (`± 20446537`)	`1.00`
`es/full/minify/libraries/d3`	`286603499` ns/iter (`± 4874024`)	`289060609` ns/iter (`± 10202538`)	`0.99`
`es/full/minify/libraries/echarts`	`1155329163` ns/iter (`± 16263464`)	`1165437835` ns/iter (`± 8170371`)	`0.99`
`es/full/minify/libraries/jquery`	`88139627` ns/iter (`± 426624`)	`88320589` ns/iter (`± 564086`)	`1.00`
`es/full/minify/libraries/lodash`	`102984434` ns/iter (`± 1384326`)	`103822733` ns/iter (`± 1661689`)	`0.99`
`es/full/minify/libraries/moment`	`51339653` ns/iter (`± 452069`)	`51198616` ns/iter (`± 194662`)	`1.00`
`es/full/minify/libraries/react`	`18750272` ns/iter (`± 135914`)	`18709241` ns/iter (`± 99244`)	`1.00`
`es/full/minify/libraries/terser`	`231589010` ns/iter (`± 1705800`)	`235141899` ns/iter (`± 1245353`)	`0.98`
`es/full/minify/libraries/three`	`411219109` ns/iter (`± 7531182`)	`412244127` ns/iter (`± 6883682`)	`1.00`
`es/full/minify/libraries/typescript`	`2941913572` ns/iter (`± 22350160`)	`2976749544` ns/iter (`± 25324039`)	`0.99`
`es/full/minify/libraries/victory`	`619174180` ns/iter (`± 15322877`)	`623606744` ns/iter (`± 7912537`)	`0.99`
`es/full/minify/libraries/vue`	`126316350` ns/iter (`± 1223349`)	`127361115` ns/iter (`± 1025080`)	`0.99`
`es/full/codegen/es3`	`28368` ns/iter (`± 52`)	`28594` ns/iter (`± 91`)	`0.99`
`es/full/codegen/es5`	`28502` ns/iter (`± 421`)	`28661` ns/iter (`± 54`)	`0.99`
`es/full/codegen/es2015`	`28460` ns/iter (`± 66`)	`28747` ns/iter (`± 53`)	`0.99`
`es/full/codegen/es2016`	`28430` ns/iter (`± 48`)	`28909` ns/iter (`± 73`)	`0.98`
`es/full/codegen/es2017`	`28444` ns/iter (`± 369`)	`28732` ns/iter (`± 61`)	`0.99`
`es/full/codegen/es2018`	`28452` ns/iter (`± 70`)	`28698` ns/iter (`± 38`)	`0.99`
`es/full/codegen/es2019`	`28421` ns/iter (`± 62`)	`28670` ns/iter (`± 70`)	`0.99`
`es/full/codegen/es2020`	`28397` ns/iter (`± 71`)	`28758` ns/iter (`± 56`)	`0.99`
`es/full/all/es3`	`173097341` ns/iter (`± 3849025`)	`178683643` ns/iter (`± 3422031`)	`0.97`
`es/full/all/es5`	`169731366` ns/iter (`± 4631339`)	`172722538` ns/iter (`± 3181931`)	`0.98`
`es/full/all/es2015`	`130565307` ns/iter (`± 2012752`)	`133888125` ns/iter (`± 2413088`)	`0.98`
`es/full/all/es2016`	`128668318` ns/iter (`± 2043591`)	`131542078` ns/iter (`± 2244203`)	`0.98`
`es/full/all/es2017`	`126245408` ns/iter (`± 2114571`)	`128411347` ns/iter (`± 2537422`)	`0.98`
`es/full/all/es2018`	`121712774` ns/iter (`± 1355545`)	`123284759` ns/iter (`± 1768432`)	`0.99`
`es/full/all/es2019`	`121374761` ns/iter (`± 1291981`)	`123102931` ns/iter (`± 1196529`)	`0.99`
`es/full/all/es2020`	`115619883` ns/iter (`± 1043980`)	`117315507` ns/iter (`± 716057`)	`0.99`
`es/full/parser`	`508195` ns/iter (`± 7155`)	`514035` ns/iter (`± 7365`)	`0.99`
`es/full/base/fixer`	`22741` ns/iter (`± 95`)	`22652` ns/iter (`± 38`)	`1.00`
`es/full/base/resolver_and_hygiene`	`87792` ns/iter (`± 238`)	`84829` ns/iter (`± 117`)	`1.03`
`serialization of serde`	`121` ns/iter (`± 2`)	`121` ns/iter (`± 0`)	`1`
`css/minify/libraries/bootstrap`	`27448040` ns/iter (`± 35738`)	`27483456` ns/iter (`± 174856`)	`1.00`
`css/visitor/compare/clone`	`2126731` ns/iter (`± 6375`)	`2080626` ns/iter (`± 20615`)	`1.02`
`css/visitor/compare/visit_mut_span`	`2321874` ns/iter (`± 6013`)	`2284422` ns/iter (`± 6036`)	`1.02`
`css/visitor/compare/visit_mut_span_panic`	`2353372` ns/iter (`± 7432`)	`2327553` ns/iter (`± 3261`)	`1.01`
`css/visitor/compare/fold_span`	`3071948` ns/iter (`± 20915`)	`3064957` ns/iter (`± 8315`)	`1.00`
`css/visitor/compare/fold_span_panic`	`3214014` ns/iter (`± 11547`)	`3218484` ns/iter (`± 13690`)	`1.00`
`css/lexer/bootstrap_5_1_3`	`5157208` ns/iter (`± 10935`)	`5246767` ns/iter (`± 47363`)	`0.98`
`css/lexer/foundation_6_7_4`	`4345393` ns/iter (`± 664`)	`4406064` ns/iter (`± 1513`)	`0.99`
`css/lexer/tailwind_3_1_1`	`822341` ns/iter (`± 155`)	`837266` ns/iter (`± 129`)	`0.98`
`css/parser/bootstrap_5_1_3`	`20723446` ns/iter (`± 27842`)	`20770941` ns/iter (`± 22791`)	`1.00`
`css/parser/foundation_6_7_4`	`16544240` ns/iter (`± 14108`)	`16617985` ns/iter (`± 19433`)	`1.00`
`css/parser/tailwind_3_1_1`	`3207147` ns/iter (`± 5101`)	`3210361` ns/iter (`± 2829`)	`1.00`
`es/codegen/colors`	`695459` ns/iter (`± 405163`)	`703631` ns/iter (`± 411170`)	`0.99`
`es/codegen/large`	`1317211` ns/iter (`± 690098`)	`2638776` ns/iter (`± 1602308`)	`0.50`
`es/codegen/with-parser/colors`	`47071` ns/iter (`± 118`)	`46711` ns/iter (`± 427`)	`1.01`
`es/codegen/with-parser/large`	`502182` ns/iter (`± 1572`)	`504372` ns/iter (`± 843`)	`1.00`
`es/minify/libraries/antd`	`1320061667` ns/iter (`± 28764168`)	`1298772633` ns/iter (`± 10969841`)	`1.02`
`es/minify/libraries/d3`	`240523650` ns/iter (`± 1563886`)	`242341486` ns/iter (`± 2356921`)	`0.99`
`es/minify/libraries/echarts`	`983107625` ns/iter (`± 11342313`)	`1003473459` ns/iter (`± 18434252`)	`0.98`
`es/minify/libraries/jquery`	`77060281` ns/iter (`± 461558`)	`77193297` ns/iter (`± 455007`)	`1.00`
`es/minify/libraries/lodash`	`92214579` ns/iter (`± 669773`)	`92582252` ns/iter (`± 681698`)	`1.00`
`es/minify/libraries/moment`	`44558904` ns/iter (`± 147292`)	`44834038` ns/iter (`± 224801`)	`0.99`
`es/minify/libraries/react`	`16644106` ns/iter (`± 72996`)	`16724326` ns/iter (`± 88713`)	`1.00`
`es/minify/libraries/terser`	`199250724` ns/iter (`± 1469858`)	`200056620` ns/iter (`± 1156055`)	`1.00`
`es/minify/libraries/three`	`334764447` ns/iter (`± 2529899`)	`339398099` ns/iter (`± 2446002`)	`0.99`
`es/minify/libraries/typescript`	`2496046748` ns/iter (`± 14685121`)	`2579827482` ns/iter (`± 44118684`)	`0.97`
`es/minify/libraries/victory`	`516291168` ns/iter (`± 24037392`)	`519655114` ns/iter (`± 7025543`)	`0.99`
`es/minify/libraries/vue`	`114355426` ns/iter (`± 2035951`)	`112685354` ns/iter (`± 1965751`)	`1.01`
`es/visitor/compare/clone`	`2317779` ns/iter (`± 15503`)	`2319355` ns/iter (`± 17660`)	`1.00`
`es/visitor/compare/visit_mut_span`	`2693937` ns/iter (`± 2571`)	`2687335` ns/iter (`± 20206`)	`1.00`
`es/visitor/compare/visit_mut_span_panic`	`2721072` ns/iter (`± 4108`)	`2725976` ns/iter (`± 3018`)	`1.00`
`es/visitor/compare/fold_span`	`3814900` ns/iter (`± 8677`)	`3817770` ns/iter (`± 9278`)	`1.00`
`es/visitor/compare/fold_span_panic`	`3929382` ns/iter (`± 4275`)	`3947598` ns/iter (`± 6428`)	`1.00`
`es/lexer/colors`	`13236` ns/iter (`± 14`)	`13125` ns/iter (`± 36`)	`1.01`
`es/lexer/angular`	`6404590` ns/iter (`± 2872`)	`6384677` ns/iter (`± 1578`)	`1.00`
`es/lexer/backbone`	`793410` ns/iter (`± 1558`)	`789769` ns/iter (`± 801`)	`1.00`
`es/lexer/jquery`	`4437634` ns/iter (`± 6766`)	`4420996` ns/iter (`± 1260`)	`1.00`
`es/lexer/jquery mobile`	`6919758` ns/iter (`± 8197`)	`6903710` ns/iter (`± 2345`)	`1.00`
`es/lexer/mootools`	`3476069` ns/iter (`± 2036`)	`3460913` ns/iter (`± 1490`)	`1.00`
`es/lexer/underscore`	`652856` ns/iter (`± 529`)	`653008` ns/iter (`± 233`)	`1.00`
`es/lexer/three`	`21010811` ns/iter (`± 14818`)	`20916073` ns/iter (`± 8258`)	`1.00`
`es/lexer/yui`	`3884764` ns/iter (`± 3225`)	`3864179` ns/iter (`± 1306`)	`1.01`
`es/parser/colors`	`29195` ns/iter (`± 74`)	`28841` ns/iter (`± 57`)	`1.01`
`es/parser/angular`	`14808116` ns/iter (`± 111955`)	`14805227` ns/iter (`± 118836`)	`1.00`
`es/parser/backbone`	`2156911` ns/iter (`± 14691`)	`2158205` ns/iter (`± 16838`)	`1.00`
`es/parser/jquery`	`11620838` ns/iter (`± 77754`)	`11693772` ns/iter (`± 83573`)	`0.99`
`es/parser/jquery mobile`	`18031299` ns/iter (`± 85191`)	`18107379` ns/iter (`± 125204`)	`1.00`
`es/parser/mootools`	`8932120` ns/iter (`± 32630`)	`8924342` ns/iter (`± 50143`)	`1.00`
`es/parser/underscore`	`1819269` ns/iter (`± 11717`)	`1819754` ns/iter (`± 12111`)	`1.00`
`es/parser/three`	`50789195` ns/iter (`± 769793`)	`50752844` ns/iter (`± 689251`)	`1.00`
`es/parser/yui`	`8997632` ns/iter (`± 58572`)	`8989576` ns/iter (`± 56515`)	`1.00`
`es/preset-env/usage/builtin_type`	`141189` ns/iter (`± 35410`)	`142343` ns/iter (`± 35483`)	`0.99`
`es/preset-env/usage/property`	`19816` ns/iter (`± 171`)	`19951` ns/iter (`± 91`)	`0.99`
`es/resolver/typescript`	`115613189` ns/iter (`± 1846962`)	`113583033` ns/iter (`± 2137335`)	`1.02`
`es/fixer/typescript`	`84484193` ns/iter (`± 2004341`)	`84433074` ns/iter (`± 1136315`)	`1.00`
`es/hygiene/typescript`	`176651860` ns/iter (`± 1466127`)	`177013307` ns/iter (`± 1162324`)	`1.00`
`es/resolver_with_hygiene/typescript`	`309474988` ns/iter (`± 1677269`)	`310487959` ns/iter (`± 1168800`)	`1.00`
`es/visitor/base-perf/module_clone`	`82169` ns/iter (`± 300`)	`82150` ns/iter (`± 578`)	`1.00`
`es/visitor/base-perf/fold_empty`	`91623` ns/iter (`± 326`)	`91817` ns/iter (`± 330`)	`1.00`
`es/visitor/base-perf/fold_noop_impl_all`	`91866` ns/iter (`± 530`)	`91907` ns/iter (`± 724`)	`1.00`
`es/visitor/base-perf/fold_noop_impl_vec`	`92141` ns/iter (`± 443`)	`92367` ns/iter (`± 441`)	`1.00`
`es/visitor/base-perf/boxing_boxed_clone`	`56` ns/iter (`± 0`)	`56` ns/iter (`± 0`)	`1`
`es/visitor/base-perf/boxing_unboxed_clone`	`41` ns/iter (`± 0`)	`41` ns/iter (`± 0`)	`1`
`es/visitor/base-perf/boxing_boxed`	`102` ns/iter (`± 0`)	`103` ns/iter (`± 0`)	`0.99`
`es/visitor/base-perf/boxing_unboxed`	`77` ns/iter (`± 0`)	`78` ns/iter (`± 0`)	`0.99`
`es/visitor/base-perf/visit_contains_this`	`3446` ns/iter (`± 96`)	`3509` ns/iter (`± 88`)	`0.98`
`es/base/parallel/resolver/typescript`	`6159892024` ns/iter (`± 551455711`)	`6263251270` ns/iter (`± 599749969`)	`0.98`
`es/base/parallel/hygiene/typescript`	`2158910454` ns/iter (`± 23822638`)	`2138183003` ns/iter (`± 21282347`)	`1.01`
`misc/visitors/time-complexity/time 5`	`102` ns/iter (`± 2`)	`102` ns/iter (`± 0`)	`1`
`misc/visitors/time-complexity/time 10`	`340` ns/iter (`± 2`)	`336` ns/iter (`± 1`)	`1.01`
`misc/visitors/time-complexity/time 15`	`656` ns/iter (`± 8`)	`656` ns/iter (`± 4`)	`1`
`misc/visitors/time-complexity/time 20`	`1219` ns/iter (`± 1`)	`1219` ns/iter (`± 1`)	`1`
`misc/visitors/time-complexity/time 40`	`6198` ns/iter (`± 4`)	`6197` ns/iter (`± 3`)	`1.00`
`misc/visitors/time-complexity/time 60`	`15746` ns/iter (`± 7`)	`15560` ns/iter (`± 19`)	`1.01`
`es/full-target/es2016`	`253523` ns/iter (`± 491`)	`253764` ns/iter (`± 1409`)	`1.00`
`es/full-target/es2017`	`245860` ns/iter (`± 230`)	`246937` ns/iter (`± 347`)	`1.00`
`es/full-target/es2018`	`235304` ns/iter (`± 346`)	`235779` ns/iter (`± 329`)	`1.00`
`es2020_nullish_coalescing`	`92989` ns/iter (`± 451`)	`92871` ns/iter (`± 365`)	`1.00`
`es2020_optional_chaining`	`123558` ns/iter (`± 305`)	`124211` ns/iter (`± 383`)	`0.99`
`es2022_class_properties`	`148742` ns/iter (`± 271`)	`148386` ns/iter (`± 327`)	`1.00`
`es2018_object_rest_spread`	`96087` ns/iter (`± 235`)	`95842` ns/iter (`± 261`)	`1.00`
`es2019_optional_catch_binding`	`84903` ns/iter (`± 230`)	`85468` ns/iter (`± 228`)	`0.99`
`es2017_async_to_generator`	`85413` ns/iter (`± 189`)	`85755` ns/iter (`± 234`)	`1.00`
`es2016_exponentiation`	`89867` ns/iter (`± 220`)	`89954` ns/iter (`± 205`)	`1.00`
`es2015_arrow`	`93628` ns/iter (`± 365`)	`93914` ns/iter (`± 192`)	`1.00`
`es2015_block_scoped_fn`	`91711` ns/iter (`± 349`)	`91978` ns/iter (`± 139`)	`1.00`
`es2015_block_scoping`	`169295` ns/iter (`± 362`)	`169542` ns/iter (`± 210`)	`1.00`