Merge remote-tracking branch 'dotnet/master' into NullableFeature by tannergooding · Pull Request #23560 · dotnet/coreclr

tannergooding · 2019-03-29T15:49:39Z

CC. @safern, @krwq, @buyaa-n, @stephentoub

This is primarily for bringing in the new compiler toolset.

Made sure tests actually test something

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

* Update dependencies from https://github.com/dotnet/corefx build 20190328.1 - Microsoft.NETCore.Platforms - 3.0.0-preview4.19178.1 - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-preview4.19178.1

* Update dependencies from https://github.com/dotnet/arcade build 20190327.11 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19177.11 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19177.11

* GetPinnableReference on String.cs * Add attributes for debugger and performance

Resolve 22303 (interlocked failures on ARM64)

These are required by the innerloop flow jobs.

* calendar * nullable: all calendars * fix likely corert error

Restore Windows arm32/arm64 innerloop build jobs

* dnceng-linux-internal-temp -> BuildPool.Ubuntu.1604.Amd64 * dotnet-internal-temp -> BuildPool.Windows.10.Amd64.VS2017

* Fix Helix queue names * Fix open Deb9 queue name.

* [WIP] Struct & SIMD improvements - Enable CSE of struct values when handle is available (and add code to get the handle of HW SIMD types) - Don't require block nodes for SIMD assignments - Don't set `GTF_GLOB_REF` on `GT_OBJ` if it is local - Set `lvRegStruct` on promoted SIMD fields - Add tests for #19910 (fixed with this PR) and #3539 & #19438 (fixed with #21314) - Additional cleanup Fix #19910

* Fix codegen for StoreNonTemporal Also, add some asserts and mark some intrinsics as not supporting containment. Fix #23509

* exclude failing in PRs tests

* Add test for IncrementingPollingCounter * Fix a bug in Increment calculation in IncrementingPollingCounter * Remove setting DisplayName property since that's a private property for now * fix comment * Remove unused variables

* Delete `setup_coredis_tools` from runtest.py. * delete dead `setup_coredis_tools` .

* exclude failing in PRs tests * And another one. * Exclude for all platforms.

No longer needed

* Update dependencies from https://github.com/dotnet/core-setup build 20190328.01 - Microsoft.NETCore.App - 3.0.0-preview4-27528-01

* Clean `valuenum.cpp`. * Clean `emitarm64.cpp`. * Clean `lsraarm64.cpp`. * Clean `lsraarmarch.cpp`. * Clean `lowerarmarch.cpp`. * Clean `lower.cpp`. * Clean `ssabuilder.cpp`. * Clean `simd.cpp`. * Clear `simdcodegenxarch.cpp`. * Clean `lowerxarch.cpp`. * Clean `scopeinfo.cpp`.

…, respectively (#23536) * Removing FeedTasksPackageVersion from dependencies.props * The corresponding metadata was removed in #22884 * Updating BuildTools, CoreCLR to preview4-03828-01, preview4-27528-71, respectively * Adding a ! in String.Searching.cs

…329.1 (#23554) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19179.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19179.1

…0190328.14 (#23556) - Microsoft.NETCore.App - 3.0.0-preview4-27528-14

safern · 2019-03-29T16:00:20Z

Should we instead rebase the branch? Will the merge commit show when we submit a PR to merge in master?

tannergooding · 2019-03-29T16:03:41Z

Will the merge commit show when we submit a PR to merge in master?

Ultimately, yes. But that is also good as it shows how the branches were integrated together. This is just normal git workflow and is what almost every other repo in existence does.

For a closer to home comparison; Roslyn has multiple feature branches (which is what this branch effectively is) and has infrastructure setup to automatically flow the changes through between branches (release branches flow into master and master flows into feature branches).

They can end up doing multiple merge commits between branches a day (although this is, more often than not, less frequent for feature branches) and don't have any problems with the workflow.

safern · 2019-03-29T16:28:15Z

@krwq it looks like the new compiler is complaining about the workaround for field initialization:

shared\System\Globalization\StringInfo.cs(29,13): error CS1717: Assignment made to same variable; did you mean to assign something else? [D:\a\1\s\src\System.Private.CoreLib\System.Private.CoreLib.csproj]

https://github.com/dotnet/coreclr/blob/NullableFeature/src/System.Private.CoreLib/shared/System/Globalization/StringInfo.cs#L29

I guess we should disable this warning as well?

tannergooding · 2019-03-29T16:32:31Z

It should also be noted: DO NOT Squash and merge this or Rebase and merge this PR.

This PR must be merged with Create a merge commit for everything to work cleanly and to not result in further merge conflicts, duplicated history, etc later down the line.

krwq · 2019-03-29T17:39:57Z

@tannergooding since this is not fixing any of the issues we have found and breaks workarounds, does it make sense to merge this right now? Perhaps we should wait for more fixes or at least better way to workaround the issues - I feel like in-lining code is more error-prone than the current workaround

tannergooding · 2019-03-29T17:43:17Z

@krwq, yes it makes sense. This brings in the new compiler bits which includes the updated analysis rules and which will allow fixing several of the workarounds that have been made.

The actualy workarounds should be removed independently, however, and this is just touching up a single place where the build would otherwise fail. I've also updated this to no longer inline and to explicitly do _str = null! instead, which was indicated to be the correct resolution for these cases.

safern · 2019-03-29T17:44:49Z

Once this PR is merged, I'll run the build that creates the PR on master 😄

krwq · 2019-03-29T17:46:24Z


        public StringInfo(string value)
        {
+            _str = null!;


actually, not too bad and easier to grep for

…ature Merge remote-tracking branch 'dotnet/master' into NullableFeature Commit migrated from dotnet/coreclr@427bedd

VSadov and others added 30 commits March 19, 2019 12:41

Enable tests.

fbbd0d4

Removed unnecessary string compares and Sleeps.

dbb4f68

Made sure tests actually test something

Make tests outerloop again

743b42a

Move QueryPerformanceCounter PInvokes to shared (dotnet/corefx#36409)

378a042

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

[master] Update dependencies from dotnet/corefx (#23455)

074bbe2

* Update dependencies from https://github.com/dotnet/corefx build 20190328.1 - Microsoft.NETCore.Platforms - 3.0.0-preview4.19178.1 - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-preview4.19178.1

[master] Update dependencies from dotnet/arcade (#23406)

64eb93c

* Update dependencies from https://github.com/dotnet/arcade build 20190327.11 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19177.11 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19177.11

GetPinnableReference on String.cs (#23428)

7c4717e

* GetPinnableReference on String.cs * Add attributes for debugger and performance

Merge pull request #23325 from VSadov/CmpExchA64

e5bfd7d

Resolve 22303 (interlocked failures on ARM64)

Restore Windows arm32/arm64 innerloop build jobs

51c84cb

These are required by the innerloop flow jobs.

Nullable: System.Char (#23480)

5b00a73

Nullable: all calendars (#23469)

90f5615

* calendar * nullable: all calendars * fix likely corert error

Nullable: System.Object (#23466)

62fb204

Merge pull request #23519 from BruceForstall/RestoreWindowsArmBuildJobs

2d0a5ba

Restore Windows arm32/arm64 innerloop build jobs

Switch to BYOC BuildPools in internal project (#23501)

3027b9d

* dnceng-linux-internal-temp -> BuildPool.Ubuntu.1604.Amd64 * dotnet-internal-temp -> BuildPool.Windows.10.Amd64.VS2017

Fix Helix queue names (#23468)

a32f7e6

* Fix Helix queue names * Fix open Deb9 queue name.

Restrict Ubuntu.1404.Arm32.Open from running against PRs (#23523)

d1f914c

Fix codegen for StoreNonTemporal (#23511)

ffe8a33

* Fix codegen for StoreNonTemporal Also, add some asserts and mark some intrinsics as not supporting containment. Fix #23509

Exclude failing in PRs tests. (#23535)

72a3f75

* exclude failing in PRs tests

Delete setup_coredis_tools from runtest.py. (#23495)

3483c6e

* Delete `setup_coredis_tools` from runtest.py. * delete dead `setup_coredis_tools` .

Exclude failing in PRs tests 2. (#23540)

10510b5

* exclude failing in PRs tests * And another one. * Exclude for all platforms.

Improve performance of Marvin32 (#22816)

ff25b93

Delete RuntimeThread.cs (#23532)

b1b8718

No longer needed

Simplify StackFrame class (#23483)

f3747cd

[master] Update dependencies from dotnet/core-setup (#23407)

78aa49c

* Update dependencies from https://github.com/dotnet/core-setup build 20190328.01 - Microsoft.NETCore.App - 3.0.0-preview4-27528-01

Avoid boxing allocations for async in Tier0 (#22984)

dc0d072

Update dependencies from https://github.com/dotnet/arcade build 20190…

88c3796

…329.1 (#23554) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19179.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19179.1

dotnet-maestro Bot and others added 2 commits March 29, 2019 11:03

Update dependencies from https://github.com/dotnet/core-setup build 2…

deebd10

…0190328.14 (#23556) - Microsoft.NETCore.App - 3.0.0-preview4-27528-14

Merge remote-tracking branch 'dotnet/master' into NullableFeature

313a79f

tannergooding commented Mar 29, 2019

View reviewed changes

Comment thread src/System.Private.CoreLib/shared/System/Globalization/StringInfo.cs Outdated

krwq reviewed Mar 29, 2019

View reviewed changes

Comment thread src/System.Private.CoreLib/shared/Internal/Runtime/Augments/RuntimeThread.cs

Fixing the StringInfo constructor to work with the nullability analysis

90cb110

krwq reviewed Mar 29, 2019

View reviewed changes

safern mentioned this pull request Mar 29, 2019

Nullable: globalization remainder #23526

Merged

safern approved these changes Mar 29, 2019

View reviewed changes

tannergooding merged commit 427bedd into dotnet:NullableFeature Mar 29, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge remote-tracking branch 'dotnet/master' into NullableFeature#23560

Merge remote-tracking branch 'dotnet/master' into NullableFeature#23560
tannergooding merged 33 commits intodotnet:NullableFeaturefrom
tannergooding:NullableFeature

tannergooding commented Mar 29, 2019

Uh oh!

safern commented Mar 29, 2019

Uh oh!

tannergooding commented Mar 29, 2019 •

edited

Loading

Uh oh!

safern commented Mar 29, 2019

Uh oh!

tannergooding commented Mar 29, 2019 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

krwq commented Mar 29, 2019

Uh oh!

tannergooding commented Mar 29, 2019

Uh oh!

safern commented Mar 29, 2019

Uh oh!

krwq Mar 29, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

Conversation

tannergooding commented Mar 29, 2019

Uh oh!

safern commented Mar 29, 2019

Uh oh!

tannergooding commented Mar 29, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

safern commented Mar 29, 2019

Uh oh!

tannergooding commented Mar 29, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

krwq commented Mar 29, 2019

Uh oh!

tannergooding commented Mar 29, 2019

Uh oh!

safern commented Mar 29, 2019

Uh oh!

krwq Mar 29, 2019

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

tannergooding commented Mar 29, 2019 •

edited

Loading

tannergooding commented Mar 29, 2019 •

edited

Loading