Skip to content

Fix mapper used to instantiate distributive conditional manufactured in declaration emit#49737

Merged
weswigham merged 1 commit intomicrosoft:mainfrom
weswigham:distributive-conditional-with-infer-decl-emit
Jun 30, 2022
Merged

Fix mapper used to instantiate distributive conditional manufactured in declaration emit#49737
weswigham merged 1 commit intomicrosoft:mainfrom
weswigham:distributive-conditional-with-infer-decl-emit

Conversation

@weswigham
Copy link
Member

@weswigham weswigham commented Jun 29, 2022

And refactor type mapper creation just a tad to give them a nice debug printback for when you're trying to track down issues involving them.

Fixes #49572.

@weswigham weswigham requested review from rbuckton and sandersn June 29, 2022 19:54
@typescript-bot typescript-bot added Author: Team For Milestone Bug PRs that fix a bug with a specific milestone labels Jun 29, 2022
weswigham
weswigham commented Jun 29, 2022
View reviewed changes
src/compiler/checker.ts
const newTypeVariable = factory.createTypeReferenceNode(name);
context.approximateLength += 37; // 15 each for two added conditionals, 7 for an added infer type
const newMapper = prependTypeMapping(type.root.checkType, newParam, type.combinedMapper || type.mapper);
const newMapper = prependTypeMapping(type.root.checkType, newParam, type.mapper);
Copy link
Member Author

@weswigham weswigham Jun 29, 2022

Choose a reason for hiding this comment

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

This line's the only one that was needed to fix the related issue - the rest was just nice refactoring I used to make this change evident while debugging.

@weswigham
Copy link
Member Author

weswigham commented Jun 29, 2022

@typescript-bot perf test this just in case - debug only code shouldn't change much, but you never know

@typescript-bot
Copy link
Collaborator

typescript-bot commented Jun 29, 2022 •
edited
Loading

Heya @weswigham, I've started to run the perf test suite on this PR at 2615ebe. You can monitor the build here.

@weswigham
Copy link
Member Author

weswigham commented Jun 30, 2022

@typescript-bot perf test this again since someone canceled the build

@typescript-bot
Copy link
Collaborator

typescript-bot commented Jun 30, 2022 •
edited
Loading

Heya @weswigham, I've started to run the perf test suite on this PR at 2615ebe. You can monitor the build here.

Update: The results are in!

@weswigham weswigham mentioned this pull request Jun 30, 2022
Merged
@typescript-bot
Copy link
Collaborator

typescript-bot commented Jun 30, 2022

@weswigham
The results of the perf run you requested are in!

Here they are:

Compiler

Comparison Report - main..49737
Metric main 49737 Delta Best Worst
Angular - node (v10.16.3, x64)
Memory used 359,627k (± 0.02%) 359,656k (± 0.02%) +30k (+ 0.01%) 359,523k 359,816k
Parse Time 2.09s (± 0.50%) 2.08s (± 0.34%) -0.01s (- 0.34%) 2.07s 2.10s
Bind Time 0.89s (± 0.75%) 0.89s (± 0.67%) +0.00s (+ 0.22%) 0.88s 0.91s
Check Time 5.94s (± 0.54%) 5.96s (± 0.28%) +0.02s (+ 0.39%) 5.93s 5.99s
Emit Time 6.09s (± 0.53%) 6.10s (± 0.49%) +0.01s (+ 0.13%) 6.04s 6.17s
Total Time 15.01s (± 0.31%) 15.04s (± 0.28%) +0.03s (+ 0.17%) 14.95s 15.13s
Compiler-Unions - node (v10.16.3, x64)
Memory used 206,408k (± 0.03%) 206,531k (± 0.04%) +123k (+ 0.06%) 206,372k 206,653k
Parse Time 0.83s (± 1.02%) 0.83s (± 0.89%) -0.00s (- 0.12%) 0.81s 0.84s
Bind Time 0.53s (± 1.59%) 0.53s (± 1.64%) -0.00s (- 0.19%) 0.52s 0.55s
Check Time 8.08s (± 0.47%) 8.03s (± 0.58%) -0.04s (- 0.56%) 7.88s 8.11s
Emit Time 2.48s (± 0.84%) 2.49s (± 0.88%) +0.01s (+ 0.48%) 2.44s 2.54s
Total Time 11.92s (± 0.37%) 11.89s (± 0.55%) -0.03s (- 0.28%) 11.65s 11.97s
Monaco - node (v10.16.3, x64)
Memory used 343,860k (± 0.02%) 343,935k (± 0.02%) +75k (+ 0.02%) 343,824k 344,206k
Parse Time 1.59s (± 0.42%) 1.58s (± 0.89%) -0.00s (- 0.25%) 1.55s 1.61s
Bind Time 0.76s (± 0.65%) 0.77s (± 0.89%) +0.00s (+ 0.13%) 0.75s 0.78s
Check Time 5.97s (± 0.38%) 5.91s (± 0.47%) -0.05s (- 0.85%) 5.85s 5.99s
Emit Time 3.26s (± 0.79%) 3.25s (± 0.55%) -0.01s (- 0.46%) 3.22s 3.28s
Total Time 11.58s (± 0.26%) 11.51s (± 0.29%) -0.08s (- 0.65%) 11.46s 11.61s
TFS - node (v10.16.3, x64)
Memory used 305,099k (± 0.02%) 305,157k (± 0.03%) +58k (+ 0.02%) 304,946k 305,376k
Parse Time 1.28s (± 0.59%) 1.28s (± 0.52%) -0.00s (- 0.16%) 1.27s 1.30s
Bind Time 0.72s (± 0.83%) 0.72s (± 0.66%) -0.00s (- 0.28%) 0.71s 0.73s
Check Time 5.40s (± 0.49%) 5.39s (± 0.46%) -0.01s (- 0.11%) 5.33s 5.45s
Emit Time 3.44s (± 1.45%) 3.43s (± 1.40%) -0.01s (- 0.41%) 3.35s 3.56s
Total Time 10.85s (± 0.45%) 10.82s (± 0.55%) -0.03s (- 0.26%) 10.75s 11.01s
material-ui - node (v10.16.3, x64)
Memory used 469,094k (± 0.01%) 469,338k (± 0.01%) +244k (+ 0.05%) 469,237k 469,500k
Parse Time 1.83s (± 0.73%) 1.83s (± 0.64%) -0.00s (- 0.22%) 1.81s 1.86s
Bind Time 0.69s (± 1.52%) 0.69s (± 1.12%) -0.00s (- 0.29%) 0.67s 0.71s
Check Time 14.43s (± 0.42%) 14.43s (± 0.39%) -0.00s (- 0.03%) 14.34s 14.57s
Emit Time 0.00s (± 0.00%) 0.00s (± 0.00%) 0.00s ( NaN%) 0.00s 0.00s
Total Time 16.96s (± 0.39%) 16.95s (± 0.33%) -0.01s (- 0.04%) 16.86s 17.08s
xstate - node (v10.16.3, x64)
Memory used 577,820k (± 0.02%) 581,217k (± 1.25%) +3,397k (+ 0.59%) 577,718k 610,570k
Parse Time 2.60s (± 0.50%) 2.59s (± 0.39%) -0.01s (- 0.31%) 2.55s 2.60s
Bind Time 1.03s (± 1.09%) 1.02s (± 0.66%) -0.01s (- 1.17%) 1.00s 1.03s
Check Time 1.54s (± 0.74%) 1.54s (± 0.59%) -0.00s (- 0.06%) 1.52s 1.56s
Emit Time 0.07s (± 0.00%) 0.07s (± 3.14%) +0.00s (+ 1.43%) 0.07s 0.08s
Total Time 5.23s (± 0.33%) 5.21s (± 0.29%) -0.02s (- 0.40%) 5.18s 5.24s
Angular - node (v12.1.0, x64)
Memory used 337,052k (± 0.08%) 336,959k (± 0.11%) -93k (- 0.03%) 335,882k 337,297k
Parse Time 2.09s (± 0.63%) 2.09s (± 0.55%) -0.00s (- 0.10%) 2.06s 2.11s
Bind Time 0.87s (± 1.00%) 0.87s (± 1.08%) +0.00s (+ 0.23%) 0.86s 0.90s
Check Time 5.78s (± 0.44%) 5.80s (± 1.03%) +0.03s (+ 0.48%) 5.72s 5.94s
Emit Time 6.35s (± 0.77%) 6.34s (± 0.66%) -0.01s (- 0.22%) 6.28s 6.46s
Total Time 15.08s (± 0.50%) 15.10s (± 0.62%) +0.02s (+ 0.12%) 14.96s 15.35s
Compiler-Unions - node (v12.1.0, x64)
Memory used 193,946k (± 0.11%) 194,136k (± 0.02%) +190k (+ 0.10%) 193,994k 194,225k
Parse Time 0.83s (± 0.82%) 0.83s (± 0.60%) 0.00s ( 0.00%) 0.82s 0.84s
Bind Time 0.55s (± 1.06%) 0.55s (± 0.87%) +0.00s (+ 0.00%) 0.54s 0.56s
Check Time 7.61s (± 0.56%) 7.55s (± 0.48%) -0.07s (- 0.88%) 7.49s 7.65s
Emit Time 2.56s (± 1.39%) 2.53s (± 0.72%) -0.02s (- 0.94%) 2.49s 2.58s
Total Time 11.54s (± 0.61%) 11.45s (± 0.33%) -0.09s (- 0.82%) 11.39s 11.56s
Monaco - node (v12.1.0, x64)
Memory used 326,896k (± 0.02%) 326,948k (± 0.02%) +52k (+ 0.02%) 326,821k 327,127k
Parse Time 1.57s (± 0.74%) 1.58s (± 1.36%) +0.01s (+ 0.64%) 1.55s 1.65s
Bind Time 0.76s (± 0.77%) 0.76s (± 0.77%) +0.00s (+ 0.00%) 0.75s 0.77s
Check Time 5.77s (± 0.61%) 5.75s (± 0.25%) -0.02s (- 0.40%) 5.73s 5.80s
Emit Time 3.30s (± 1.00%) 3.28s (± 0.47%) -0.01s (- 0.42%) 3.26s 3.32s
Total Time 11.40s (± 0.62%) 11.37s (± 0.22%) -0.03s (- 0.25%) 11.32s 11.43s
TFS - node (v12.1.0, x64)
Memory used 289,785k (± 0.03%) 289,757k (± 0.03%) -28k (- 0.01%) 289,639k 290,066k
Parse Time 1.30s (± 1.20%) 1.29s (± 0.58%) -0.01s (- 0.54%) 1.28s 1.31s
Bind Time 0.73s (± 0.94%) 0.72s (± 0.46%) -0.01s (- 0.83%) 0.71s 0.73s
Check Time 5.33s (± 0.18%) 5.31s (± 0.49%) -0.02s (- 0.45%) 5.27s 5.40s
Emit Time 3.52s (± 0.74%) 3.51s (± 0.48%) -0.00s (- 0.09%) 3.48s 3.56s
Total Time 10.87s (± 0.37%) 10.83s (± 0.31%) -0.04s (- 0.37%) 10.76s 10.93s
material-ui - node (v12.1.0, x64)
Memory used 447,942k (± 0.09%) 448,441k (± 0.02%) +499k (+ 0.11%) 448,172k 448,567k
Parse Time 1.83s (± 0.41%) 1.83s (± 0.30%) +0.00s (+ 0.05%) 1.82s 1.84s
Bind Time 0.68s (± 0.66%) 0.68s (± 0.98%) +0.00s (+ 0.29%) 0.67s 0.70s
Check Time 13.01s (± 0.69%) 12.97s (± 0.65%) -0.04s (- 0.30%) 12.78s 13.18s
Emit Time 0.00s (± 0.00%) 0.00s (± 0.00%) 0.00s ( NaN%) 0.00s 0.00s
Total Time 15.51s (± 0.59%) 15.48s (± 0.53%) -0.03s (- 0.20%) 15.28s 15.69s
xstate - node (v12.1.0, x64)
Memory used 546,484k (± 1.31%) 549,759k (± 1.74%) +3,275k (+ 0.60%) 543,079k 575,633k
Parse Time 2.55s (± 0.58%) 2.55s (± 0.36%) -0.00s (- 0.04%) 2.53s 2.57s
Bind Time 1.04s (± 1.17%) 1.03s (± 1.56%) -0.01s (- 1.15%) 0.99s 1.06s
Check Time 1.49s (± 0.52%) 1.49s (± 0.52%) 0.00s ( 0.00%) 1.47s 1.51s
Emit Time 0.07s (± 0.00%) 0.07s (± 0.00%) 0.00s ( 0.00%) 0.07s 0.07s
Total Time 5.15s (± 0.33%) 5.14s (± 0.40%) -0.01s (- 0.19%) 5.10s 5.19s
Angular - node (v14.15.1, x64)
Memory used 335,281k (± 0.01%) 335,328k (± 0.01%) +47k (+ 0.01%) 335,217k 335,405k
Parse Time 2.05s (± 0.72%) 2.06s (± 0.62%) +0.01s (+ 0.24%) 2.03s 2.08s
Bind Time 0.90s (± 0.75%) 0.90s (± 0.75%) 0.00s ( 0.00%) 0.89s 0.92s
Check Time 5.74s (± 0.41%) 5.74s (± 0.39%) +0.00s (+ 0.09%) 5.69s 5.81s
Emit Time 6.39s (± 0.85%) 6.39s (± 0.94%) -0.00s (- 0.02%) 6.30s 6.60s
Total Time 15.08s (± 0.50%) 15.09s (± 0.47%) +0.01s (+ 0.06%) 14.93s 15.32s
Compiler-Unions - node (v14.15.1, x64)
Memory used 192,598k (± 0.08%) 192,632k (± 0.12%) +34k (+ 0.02%) 191,679k 192,795k
Parse Time 0.84s (± 0.58%) 0.85s (± 0.68%) +0.00s (+ 0.36%) 0.84s 0.86s
Bind Time 0.57s (± 1.43%) 0.57s (± 1.74%) 0.00s ( 0.00%) 0.56s 0.61s
Check Time 7.65s (± 0.89%) 7.64s (± 0.65%) -0.01s (- 0.12%) 7.53s 7.75s
Emit Time 2.52s (± 0.49%) 2.51s (± 0.80%) -0.01s (- 0.48%) 2.47s 2.55s
Total Time 11.58s (± 0.70%) 11.57s (± 0.49%) -0.02s (- 0.16%) 11.43s 11.67s
Monaco - node (v14.15.1, x64)
Memory used 325,644k (± 0.01%) 325,659k (± 0.01%) +15k (+ 0.00%) 325,619k 325,702k
Parse Time 1.58s (± 0.52%) 1.58s (± 0.48%) -0.01s (- 0.57%) 1.56s 1.59s
Bind Time 0.79s (± 0.38%) 0.79s (± 0.59%) -0.00s (- 0.25%) 0.78s 0.80s
Check Time 5.69s (± 0.48%) 5.67s (± 0.32%) -0.02s (- 0.37%) 5.62s 5.70s
Emit Time 3.37s (± 0.53%) 3.36s (± 1.05%) -0.00s (- 0.06%) 3.29s 3.47s
Total Time 11.43s (± 0.29%) 11.40s (± 0.42%) -0.03s (- 0.29%) 11.31s 11.53s
TFS - node (v14.15.1, x64)
Memory used 288,776k (± 0.01%) 288,773k (± 0.01%) -3k (- 0.00%) 288,713k 288,826k
Parse Time 1.33s (± 1.22%) 1.33s (± 1.00%) +0.00s (+ 0.23%) 1.30s 1.36s
Bind Time 0.75s (± 2.10%) 0.79s (± 5.39%) +0.04s (+ 4.93%) 0.73s 0.86s
Check Time 5.32s (± 0.42%) 5.31s (± 0.34%) -0.02s (- 0.30%) 5.27s 5.36s
Emit Time 3.57s (± 2.54%) 3.59s (± 2.09%) +0.02s (+ 0.50%) 3.45s 3.72s
Total Time 10.97s (± 0.83%) 11.02s (± 0.78%) +0.04s (+ 0.41%) 10.84s 11.17s
material-ui - node (v14.15.1, x64)
Memory used 446,339k (± 0.01%) 446,663k (± 0.01%) +325k (+ 0.07%) 446,607k 446,723k
Parse Time 1.87s (± 0.60%) 1.87s (± 0.52%) -0.00s (- 0.11%) 1.86s 1.90s
Bind Time 0.72s (± 1.15%) 0.73s (± 0.55%) +0.00s (+ 0.55%) 0.72s 0.74s
Check Time 13.12s (± 0.56%) 13.07s (± 0.55%) -0.05s (- 0.41%) 12.97s 13.26s
Emit Time 0.00s (± 0.00%) 0.00s (± 0.00%) 0.00s ( NaN%) 0.00s 0.00s
Total Time 15.72s (± 0.51%) 15.67s (± 0.45%) -0.05s (- 0.31%) 15.55s 15.86s
xstate - node (v14.15.1, x64)
Memory used 541,035k (± 0.00%) 541,115k (± 0.01%) +81k (+ 0.01%) 541,035k 541,172k
Parse Time 2.60s (± 0.61%) 2.60s (± 0.54%) +0.00s (+ 0.19%) 2.58s 2.65s
Bind Time 1.14s (± 1.09%) 1.16s (± 1.04%) +0.02s (+ 1.67%) 1.13s 1.19s
Check Time 1.54s (± 0.64%) 1.53s (± 0.66%) -0.00s (- 0.26%) 1.51s 1.56s
Emit Time 0.07s (± 4.95%) 0.07s (± 3.14%) 🟩-0.00s (- 5.33%) 0.07s 0.08s
Total Time 5.35s (± 0.40%) 5.37s (± 0.32%) +0.03s (+ 0.47%) 5.33s 5.41s
System
Machine Namets-ci-ubuntu
Platformlinux 4.4.0-210-generic
Architecturex64
Available Memory16 GB
Available Memory15 GB
CPUs4 × Intel(R) Core(TM) i7-4770 CPU @ 3.40GHz
Hosts
  • node (v10.16.3, x64)
  • node (v12.1.0, x64)
  • node (v14.15.1, x64)
Scenarios
  • Angular - node (v10.16.3, x64)
  • Angular - node (v12.1.0, x64)
  • Angular - node (v14.15.1, x64)
  • Compiler-Unions - node (v10.16.3, x64)
  • Compiler-Unions - node (v12.1.0, x64)
  • Compiler-Unions - node (v14.15.1, x64)
  • Monaco - node (v10.16.3, x64)
  • Monaco - node (v12.1.0, x64)
  • Monaco - node (v14.15.1, x64)
  • TFS - node (v10.16.3, x64)
  • TFS - node (v12.1.0, x64)
  • TFS - node (v14.15.1, x64)
  • material-ui - node (v10.16.3, x64)
  • material-ui - node (v12.1.0, x64)
  • material-ui - node (v14.15.1, x64)
  • xstate - node (v10.16.3, x64)
  • xstate - node (v12.1.0, x64)
  • xstate - node (v14.15.1, x64)
Benchmark Name Iterations
Current 49737 10
Baseline main 10

TSServer

Comparison Report - main..49737
Metric main 49737 Delta Best Worst
xstateTSServer - node (v10.16.3, x64)
Initial load time 2,163.90ms (± 0.49%) 2,154.20ms (± 0.37%) -9.70ms (- 0.45%) 2,140.00ms 2,176.00ms
Geterr time 751.00ms (± 0.42%) 754.90ms (± 0.61%) +3.90ms (+ 0.52%) 744.00ms 763.00ms
References time 98.70ms (± 1.12%) 95.70ms (± 0.92%) 🟩-3.00ms (- 3.04%) 94.00ms 98.00ms
Navto time 252.40ms (± 1.30%) 250.20ms (± 1.16%) -2.20ms (- 0.87%) 245.00ms 258.00ms
Navto count 256.00 (± 0.00%) 256.00 (± 0.00%) 0.00 ( 0.00%) 256.00 256.00
Completions time 239.90ms (± 1.85%) 245.10ms (± 1.33%) +5.20ms (+ 2.17%) 237.00ms 251.00ms
Completions count 3,205.00 (± 0.00%) 3,205.00 (± 0.00%) 0.00 ( 0.00%) 3,205.00 3,205.00
xstateTSServer - node (v12.1.0, x64)
Initial load time 2,108.80ms (± 0.45%) 2,094.10ms (± 0.64%) -14.70ms (- 0.70%) 2,072.00ms 2,131.00ms
Geterr time 748.70ms (± 0.49%) 743.70ms (± 0.30%) -5.00ms (- 0.67%) 738.00ms 749.00ms
References time 67.60ms (± 0.54%) 67.80ms (± 1.07%) +0.20ms (+ 0.30%) 67.00ms 70.00ms
Navto time 236.10ms (± 0.89%) 238.90ms (± 0.87%) +2.80ms (+ 1.19%) 232.00ms 242.00ms
Navto count 256.00 (± 0.00%) 256.00 (± 0.00%) 0.00 ( 0.00%) 256.00 256.00
Completions time 244.40ms (± 1.47%) 239.10ms (± 0.71%) -5.30ms (- 2.17%) 236.00ms 242.00ms
Completions count 3,205.00 (± 0.00%) 3,205.00 (± 0.00%) 0.00 ( 0.00%) 3,205.00 3,205.00
xstateTSServer - node (v14.15.1, x64)
Initial load time 2,226.50ms (± 0.42%) 2,215.80ms (± 0.56%) -10.70ms (- 0.48%) 2,199.00ms 2,247.00ms
Geterr time 762.30ms (± 0.44%) 763.30ms (± 0.37%) +1.00ms (+ 0.13%) 758.00ms 773.00ms
References time 68.10ms (± 1.24%) 67.70ms (±10.04%) -0.40ms (- 0.59%) 64.00ms 95.00ms
Navto time 251.30ms (± 1.59%) 248.90ms (± 0.47%) -2.40ms (- 0.96%) 246.00ms 250.00ms
Navto count 256.00 (± 0.00%) 256.00 (± 0.00%) 0.00 ( 0.00%) 256.00 256.00
Completions time 246.60ms (± 3.71%) 242.20ms (± 0.47%) -4.40ms (- 1.78%) 239.00ms 245.00ms
Completions count 3,205.00 (± 0.00%) 3,205.00 (± 0.00%) 0.00 ( 0.00%) 3,205.00 3,205.00
System
Machine Namets-ci-ubuntu
Platformlinux 4.4.0-210-generic
Architecturex64
Available Memory16 GB
Available Memory15 GB
CPUs4 × Intel(R) Core(TM) i7-4770 CPU @ 3.40GHz
Hosts
  • node (v10.16.3, x64)
  • node (v12.1.0, x64)
  • node (v14.15.1, x64)
Scenarios
  • xstateTSServer - node (v10.16.3, x64)
  • xstateTSServer - node (v12.1.0, x64)
  • xstateTSServer - node (v14.15.1, x64)
Benchmark Name Iterations
Current 49737 10
Baseline main 10

Developer Information:

Download Benchmark

@weswigham weswigham merged commit 4c34f2c into microsoft:main Jun 30, 2022
@microsoft microsoft locked as resolved and limited conversation to collaborators Oct 22, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@andrewbranch andrewbranch andrewbranch approved these changes

@sandersn sandersn Awaiting requested review from sandersn

@rbuckton rbuckton Awaiting requested review from rbuckton

Assignees

@weswigham weswigham

Labels

Author: Team For Milestone Bug PRs that fix a bug with a specific milestone

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Function involving FlatArray is transformed in declaration in an incompatible type.

3 participants

@weswigham @typescript-bot @andrewbranch