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.

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

Merge main to feature/nullness #17097

Merged
merged 39 commits into from May 17, 2024
Merged

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from main into feature/nullness.

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯

Troubleshooting conflicts

Identify authors of changes which introduced merge conflicts

Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:

Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.

Resolve merge conflicts using your local repo

Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.

git fetch --all
git checkout -t upstream/merges/main-to-feature/nullness
git reset --hard upstream/feature/nullness
git merge upstream/main
# Fix merge conflicts
git commit
git push upstream merges/main-to-feature/nullness --force

TheAngryByrd and others added 6 commits April 25, 2024 13:53
…17085)

#17082

Co-authored-by: Petr <psfinaki@users.noreply.github.com>
* Remove some dead code

* Fix

* Remove unnecessary fn

* oops
#16857)

* Generate new Equals overload to avoid boxing for structural comparison

* More benchmarks

---------

Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
)

* Allow AttributeTargets.Field and .Property for type let bindings

* Fixed tests which involved fields+functions

---------

Co-authored-by: Petr <psfinaki@users.noreply.github.com>
* Add volatile to valueFactory

* reformat

---------

Co-authored-by: Petr <psfinaki@users.noreply.github.com>
* corebeforeafter

* depends

* temp

* temp

* tweak

* tweak

* typo
@dotnet-bot
Copy link
Contributor Author

⚠ This PR has merge conflicts. @T-Gro

T-Gro and others added 18 commits April 29, 2024 11:53
…425.1 (#17094)

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Redo compile before - add fail on plainbuild error

* temp

* dotnet build it
* Error when property has same name as DU case

* Update tests

* fix test

* update condition

* Three is better than one

* More tests

* release notes

* Update tests/FSharp.Compiler.ComponentTests/Language/DotLambdaTests.fs

Co-authored-by: Petr <psfinaki@users.noreply.github.com>

* one less error

---------

Co-authored-by: Petr <psfinaki@users.noreply.github.com>
* Update build depencencies + SDK

* Update sb prebuilt baselines
* Add error FS3866 tcActivePatternArgumentCountNotMatch

* fix: single case active pattern returning unit can omit return value

* fix: Total AP case returning unit can omit unit

* fix: allow omit last argument when return type of the case not solve

* try fix test

* try fix test 2

* Change way to get parameter count

* try fix 3

* single case: allow all dtys.Length >= args.Length

* update release note

* divide the msg by whether with params

* fix test

* typo

* update xlf

* split the error to four

* fix test

* improve msg

* fix test

* 更新 ActivePatternArgCountMismatchTest.fs

* update to errorR

* revert errorR

* fix

---------

Co-authored-by: Petr <psfinaki@users.noreply.github.com>
* Added simple caching for TC results of implicit-yield expressions. This avoids exponential blowup when checking nested builders with implicit yields
* LSP design proposal

* Update docs/lsp.md

Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>

* Update docs/lsp.md

Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>

* update

* clarification, extensibility

* diagnostic mode update

* update

* update info around VS extension

* doc updates

---------

Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
* Fix CG Equals for DU and reenable realsig+

* oops

* un hack surface area tests
* Gather up any prelude & reapply after lowering

* E.g.,

  ```fsharp
  [let y = f () in for … in … -> …]
  ```

  and

  ```fsharp
  [f (); g (); for … in … -> …]
  ```

  are transformed into something like

  ```fsharp
  let y = f () in [for … in … -> …]
  ```

  and

  ```fsharp
  f (); g (); [for … in … -> …]
  ```

  so that the existing pattern recognition of simple mappings and
  integral ranges may succeed.
* Sourcebuild perf

* proto

* publish

* tweak

* baseline

* tweak

* fix publish framework

* temp

* temp

* temp

* publish

* props

* UseCurrentRuntimeIdentifier

* oops

* publishing.props

* BUILDING_USING_DOTNET

* fsharpqa and ngen

* Reqork -norealsig

* update yaml

* revert realsig changes
…ence-packages build 20240506.2 (#17122)

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.24252.1 -> To Version 9.0.0-alpha.1.24256.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* More ValueOption in compiler: part 3 (and the last)

* Benchmarks

* surface area

* Revert "surface area"

This reverts commit 948b8c3.

* up

* Remove benchmarks

* Update

* Update 8.0.400.md

---------

Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
* Minor compiler perf improvements

* Override `ToString` on `BuildPhase`.

* Cache the delegate passed into `ConcurrentDictionary.GetOrAdd` where
  possible. See #14582, fsharp/fslang-suggestions#1083, etc.

* Name

* Update release notes

* Fmt

* Remove unneeded `StringBuilder`

* Start count at 1

* Go back to `GetOrAdd`

* I don't think I fully understand why, but I did some rough
  microbenchmarking, and for some reason the `GetOrAdd` and
  `Interlocked.Increment` on a ref cell technique is actually something
  like twice as fast as `AddOrUpdate`.

---------

Co-authored-by: Petr <psfinaki@users.noreply.github.com>
brianrourkeboll and others added 9 commits May 13, 2024 18:56
* Consolidate emitted IL `for`-loop tests

* The test sources and baselines for these were duplicated in #15484 to
  test the realsig feature, but that meant that the test _sources_
  needed to be kept in sync by hand. This change uses the approach used
  in #16795 instead: it reuses the same test _source_ files and just
  adds duplicate _tests_ to check the emitted IL with realsig+.

* Update netfx baselines

* Fix find/replace bug

* Unify netstandard assembly version in IL

* Re-update baselines

---------

Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
…ence-packages build 20240513.3 (#17142)

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.24256.2 -> To Version 9.0.0-alpha.1.24263.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
* fix some inconsistencies

* we don't intend to dispose this ever

* removed

* multiple loggers

* fix RegisterAndImportReferencedAssemblies

* fix deadlock in fsi

* fix some BuildGraphTests

* restore asyncmemoize

* fix missing logger in test

* format

* fix transparent compiler nre

* cleanup

* default value

* add some comments

* foramt and notes to make it green if it's green

* wrap any parallel computations that potentially push diagnostics

* try to fix buildgraphtests

* try to eradicate deadlocks in tests

* fix buildgraph test

* disable for a moment

* flatten exceptions

* reshuffle

* prevent graphnode deadlock

* yield

* diff

* add some comments

* add AsyncLocal test

* more testing

* not needed after all?

* test

* format

* revert

* try RunContinuationsAsynchronously

* try to deal with deadlock another way

* nope

* revert

* format

* restore release notes

* add test for ListParallel

* speed up test

* improve test

* simpler MultipleDiagnosticsLoggers

* rename and speedup test

* parallel logging perf

* remove SwitchToThreadPool

* sequential

* Revert "sequential"

This reverts commit 8c77c0c.

* revert spurious change

* fix comments

* test MultipleDiagnosticsLoggers

* add comment and clean up

---------

Co-authored-by: Petr <psfinaki@users.noreply.github.com>
…ence-packages build 20240514.1 (#17147)

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.24263.3 -> To Version 9.0.0-alpha.1.24264.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@T-Gro T-Gro requested a review from a team as a code owner May 16, 2024 13:08
T-Gro and others added 6 commits May 16, 2024 16:21
…514.1 (#17158)

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24225.1 -> To Version 8.0.0-beta.24264.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@T-Gro T-Gro merged commit 176275f into feature/nullness May 17, 2024
14 of 30 checks passed
@T-Gro T-Gro deleted the merges/main-to-feature/nullness branch May 17, 2024 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet