[automated] Merge branch 'master' => 'release/3.0' #24118

dotnet-maestro-bot · 2019-04-19T17:06:48Z

I detected changes in the master branch which have not been merged yet to release/3.0. I'm a robot and am configured to help you automatically keep release/3.0 up to date, so I've opened this PR.

This PR merges commits made on master by the following committers:

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout master
git pull --ff-only
git checkout release/3.0
git pull --ff-only
git merge --no-ff master

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/coreclr HEAD:merge/master-to-release/3.0

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/coreclr HEAD:merge/master-to-release/3.0

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/master-to-release/3.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/master-to-release/3.0 release/3.0
git pull https://github.com/dotnet-maestro-bot/coreclr merge/master-to-release/3.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/coreclr merge/master-to-release/3.0

or if you are using SSH

git checkout -b merge/master-to-release/3.0 release/3.0
git pull git@github.com:dotnet-maestro-bot/coreclr merge/master-to-release/3.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/coreclr merge/master-to-release/3.0

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

Added test case GitHub_23739.cs

Enable CLR write watch for ARM64 Windows

This change removes CPU groups emulation from Unix PAL and modifies the GC and thread pool code accordingly.

Block the hoisting of TYP_STRUCT rvalues in loop hoisting

* Fix build on OSX and Linux machines without NUMA installed - there were couple of places where I was missing ifdefs * Fix bug in nodeMaskLength computation * Remove testing change in eeconfig.cpp that has leaked into the PR * Fix GCToOSInterface::GetTotalProcessorCount for embedded GC to return all processors on the system, not just the ones enabled for the current process.

* Update exclusion for System.Threading.Tasks.Tests There is a race in the test, which causes failures in various stress runs. And that is not Linux specific. The failure is addressed in dotnet/corefx#36645 This is to update the exclusion lists to make it not just for Linux and to link to the fix PR, so that it could be tracked when it makes it into coreclr. * Update corefx_test_exclusions.txt * Update corefx_test_exclusions.txt

* Improve RuntimeHelpers.GetSubArray This change does three things. First, it fixes `GetSubArray` to work when the supplied array is actually a `U[]` where `U : T`. Currently this case ends up throwing an exception inside of span, which doesn't like working with arrays covariantly. Second, it fixes argument validation so that we throw an ArgumentNullException if the input array is null rather than NullReferenceException. Third, it improves the performance of `GetSubArray` for the 95% common case where either `T` is a value type or the type of the array matches the `T` type specified. * Only use `Array.Empty<T>` when `typeof(T[]) == array.GetType()`

…0190408.16 (dotnet#23836) - Microsoft.NETCore.App - 3.0.0-preview5-27608-16

* Nullable: System.IO Everything exception StreamReader, StreamWriter, BinaryReader, BinaryWriter, which are waiting for some changes in master to propagate over to the feature branch. * Address PR feedback

* Nullable: Attributes, SafeHandles, and misc * Address PR feedback

…otnet#23476) * Add DisplayNameAttribute to each Fact * Split files under bin/tests folder into groups and specify the corresponding *.XUnitWrapper.dll * Group some of the *.XUnitWrapper.dll files into PayloadGroups and split others into different PayloadGroups if they have more than one TestGroup defined * Add "TestGroup" trait to XUnitWrapper facts * Add Microsoft.DotNet.XUnitConsoleRunner to eng\Versions.props * Overwrite xunit.console.dll with the version coming from Microsoft.DotNet.XUnitConsoleRunner

… mainv2 (dotnet#23826)

…module references (dotnet#23828) * Exclude PInvokes declared on other modules. We don't yet encode cross module references

Currently compiletion will fail with an assert because of `optPrepareTreeForReplacement`.

* Update CCW semantics to not unwrap when a managed COM server was activated from a managed COM client. This is a functional change from .NET Framework. * Add support for CoreShim to "attach" to the existing CLR instance when running from a CoreRun scenario. * Add testing for NET COM client activating a NET COM server

…net#23816) * Don't denormalize enum return values on instance methods on x86. * Reuse closedElemType.

- Simplify CountNumberOfLeadingAsciiBytesFrom24BitInteger - Extract some consts out to top of file w/ comments

Create a new tree with const val and attach side-effects to it. Extract common code and delete returns in the of the switch.

SetNotificationForWaitCompletion is meant to be func-eval'ed by the debugger to enable async step out. But this method was being removed by the IL linker. This adds it back.

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

JIT: fix arm64 crossgen simd issue

* Static RVA fields should be placed sequentially after the qsort operation to not break Managed C++ binaries in R2R * Add regression test

Only the corefx jobs are left. The rest should be done in AzDO, and scheduling both AzDO and Jenkins is causing too much work for the few machines we have.

Fixes an issue with crossgen on Arm64/linux

…riodicJobs Reduce the number of Linux arm32 periodic jobs triggered

These types are value types; they are returned by copying. Marking the return type as const has no effect: since the value is copied, the caller can modify it anyway. This resolves all the -Wignored-qualifiers warnings produced by clang 7 (when those warnings are explicitly enabled).

…(long*, V128) (dotnet#24102)

This refactoring is preparation for disabling fragile NGen support in the runtime. It keeps fragile-NGen specific code under FEATURE_PREJIT and moves the code required to support R2R to be outside FEATURE_PREJIT. The eventual goal is to compile the runtime without FEATURE_PREJIT defined to avoid fragile-NGen specific overhead.

dotnet#23363 added a crossplat implementation of `GetWin32Resource`, but forgot to enable places that call it.

) * Block default interface usage in COM scenarios Add additional test cases and move some CCW functions to a more consolidated layout.

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

…otnet#24044) CLR_ADDITIONAL_COMPILER_OPTIONS was set before visibility settings and thus adding additional compiler options would be overwritten.

Microsoft.NETCore.App - 3.0.0-preview5-27618-16

We don't have the capacity to run these on every commit

wtgodbe · 2019-04-19T17:40:31Z

CC @mmitche @danmosemsft @RussKeldorph

RussKeldorph · 2019-04-19T18:12:32Z

@dotnet/dotnet-diag @mikem8361

[ 99%] Linking CXX shared library libmscordaccore.dylib
Undefined symbols for architecture x86_64:
  "_GetCurrentProcessorNumberEx", referenced from:
     -exported_symbol[s_list] command line option
  "_GetLogicalProcessorInformationEx", referenced from:
     -exported_symbol[s_list] command line option
  "_GetThreadGroupAffinity", referenced from:
     -exported_symbol[s_list] command line option
  "_SetThreadGroupAffinity", referenced from:
     -exported_symbol[s_list] command line option
ld: symbol(s) not found for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make[2]: *** [src/dlls/mscordac/libmscordaccore.dylib] Error 1
make[1]: *** [src/dlls/mscordac/CMakeFiles/mscordaccore.dir/all] Error 2
make: *** [all] Error 2
Failed to build CoreCLR component.

wtgodbe · 2019-04-19T18:23:04Z

@hoyosjs I think I messed up resolving merge conflicts for mscordac_unixexports.src, can you take a look?

hoyosjs · 2019-04-19T22:42:37Z

@wtgodbe All green

wtgodbe · 2019-04-19T23:13:54Z

Thanks @hoyosjs!

GrabYourPitchforks and others added 30 commits April 8, 2019 15:21

Simplify vectorized logic; remove unnecessary adjustment

c4e94df

Block the hoisting of TYP_STRUCT rvalues in loop hoisting

b87e634

Added test case GitHub_23739.cs

Merge pull request dotnet#23752 from adityamandaleeka/arm64_clrww

e8d5798

Enable CLR write watch for ARM64 Windows

Remove Unix CPU groups emulation

0609909

This change removes CPU groups emulation from Unix PAL and modifies the GC and thread pool code accordingly.

Merge pull request dotnet#23739 from briansull/struct-cse

cd41863

Block the hoisting of TYP_STRUCT rvalues in loop hoisting

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

35ce149

…0190408.16 (dotnet#23836) - Microsoft.NETCore.App - 3.0.0-preview5-27608-16

Update CoreClr to preview5-27609-71 (dotnet#23809)

b1042c7

Nullable: System.IO (dotnet#23732)

5ce35bf

* Nullable: System.IO Everything exception StreamReader, StreamWriter, BinaryReader, BinaryWriter, which are waiting for some changes in master to propagate over to the feature branch. * Address PR feedback

Nullable: Attributes, SafeHandles, and misc (dotnet#23810)

0006d20

* Nullable: Attributes, SafeHandles, and misc * Address PR feedback

Unconditionally set CrossGenTest to false for readytorun/tests/mainv1…

5e20dd4

… mainv2 (dotnet#23826)

Exclude PInvokes declared on other modules. We don't yet encode cross…

5608b4f

…module references (dotnet#23828) * Exclude PInvokes declared on other modules. We don't yet encode cross module references

Delete condition that was previously checked with noway_assert.

b07b726

Destroy the old tree in optAssertionProp_Update.

04c7fa6

Currently compiletion will fail with an assert because of `optPrepareTreeForReplacement`.

Merge remote-tracking branch 'origin/master' into utf8_validation_apis_3

5db40d7

PR feedback: GetElement(0) -> Sse2.StoreLow

f4519f5

Don't denormalize enum return values on instance methods on x86. (dot…

29fabe7

…net#23816) * Don't denormalize enum return values on instance methods on x86. * Reuse closedElemType.

PR feedback

9baf5be

- Simplify CountNumberOfLeadingAsciiBytesFrom24BitInteger - Extract some consts out to top of file w/ comments

Clean optVNConstantPropOnTree.

c6dbbf0

Create a new tree with const val and attach side-effects to it. Extract common code and delete returns in the of the switch.

Clarify some unsupported cases in optVNConstantPropOnTree.

325bfa4

Delete the asignment that was added as a workaround.

c1b36e9

PR feedback: Enable SSE2 in Utf16Utility code

2a3fe36

Add 'SetNotificationForWaitCompletion' to ILLinkTrim.xml (dotnet#23822)

9ddc4cf

SetNotificationForWaitCompletion is meant to be func-eval'ed by the debugger to enable async step out. But this method was being removed by the IL linker. This adds it back.

Expand masks in Utf8Utility, fix const in fallback path

2d47f1b

Update CoreRT for changes in shared partition

50f8ab7

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

Add back using to EventSourceException

0d427ca

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

RussKeldorph and others added 20 commits April 18, 2019 11:11

Merge pull request dotnet#24071 from AndyAyersMS/Fix24055

af83b8a

JIT: fix arm64 crossgen simd issue

If IPC connections fails, then remove active session. (dotnet#24082)

b874895

Disable native-client tests on IL round-trip (dotnet#24041)

cae14d0

Fix RVA field placement order (dotnet#24047)

1a2bc6c

* Static RVA fields should be placed sequentially after the qsort operation to not break Managed C++ binaries in R2R * Add regression test

Reduce the number of Linux arm32 periodic jobs triggered

8d4fccb

Only the corefx jobs are left. The rest should be done in AzDO, and scheduling both AzDO and Jenkins is causing too much work for the few machines we have.

Allow UpperVector Save and Restore without base type (dotnet#24080)

7e8c5b6

Fixes an issue with crossgen on Arm64/linux

Merge pull request dotnet#24105 from BruceForstall/ReduceLinuxArm32Pe…

65f74d4

…riodicJobs Reduce the number of Linux arm32 periodic jobs triggered

Adding Sse2.StoreScalar(long*, V128) which will replace Sse2.StoreLow…

4686029

…(long*, V128) (dotnet#24102)

Fix performance regression on glibc on Linux (dotnet#24099)

0ca6b89

Nullable: System.Collections.Concurrent (dotnet#24054)

c05d03c

Nullable: couple of missing #nullable enable (dotnet#24094)

ea70542

Look for IBC data outside Windows (dotnet#24062)

4049a3e

dotnet#23363 added a crossplat implementation of `GetWin32Resource`, but forgot to enable places that call it.

Block usage of default interfaces feature in COM scenarios (dotnet#23970

df6b6f6

) * Block default interface usage in COM scenarios Add additional test cases and move some CCW functions to a more consolidated layout.

Disable warning in ValueStringBuilder.ToString

3459f81

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

Fix build errors in Interop.Errors

9275010

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

Move CLR_ADDITIONAL_COMPILER_OPTIONS to be set after default options (d…

9c81799

…otnet#24044) CLR_ADDITIONAL_COMPILER_OPTIONS was set before visibility settings and thus adding additional compiler options would be overwritten.

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

d5acaf0

Microsoft.NETCore.App - 3.0.0-preview5-27618-16

Remove commit triggered linux_arm ReadyToRun jobs

f47de43

We don't have the capacity to run these on every commit

dotnet-maestro-bot force-pushed the merge/master-to-release/3.0 branch from 08d1cd0 to f47de43 Compare April 19, 2019 17:06

Merge branch 'release/3.0' into merge/master-to-release/3.0

85c3576

Fix DAC PAL exports for preview 5

b1d22a4

hoyosjs force-pushed the merge/master-to-release/3.0 branch from 6145988 to b1d22a4 Compare April 19, 2019 20:41

wtgodbe merged commit cc29bc4 into dotnet:release/3.0 Apr 19, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[automated] Merge branch 'master' => 'release/3.0' #24118

[automated] Merge branch 'master' => 'release/3.0' #24118

Uh oh!

dotnet-maestro-bot commented Apr 19, 2019

Uh oh!

wtgodbe commented Apr 19, 2019

Uh oh!

RussKeldorph commented Apr 19, 2019

Uh oh!

wtgodbe commented Apr 19, 2019

Uh oh!

hoyosjs commented Apr 19, 2019

Uh oh!

wtgodbe commented Apr 19, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

46 participants

[automated] Merge branch 'master' => 'release/3.0' #24118

[automated] Merge branch 'master' => 'release/3.0' #24118

Uh oh!

Conversation

dotnet-maestro-bot commented Apr 19, 2019

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

wtgodbe commented Apr 19, 2019

Uh oh!

RussKeldorph commented Apr 19, 2019

Uh oh!

wtgodbe commented Apr 19, 2019

Uh oh!

hoyosjs commented Apr 19, 2019

Uh oh!

wtgodbe commented Apr 19, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

46 participants