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 dev15.7.x to master #25503

Merged
merged 57 commits into from
Mar 16, 2018
Merged

Merge dev15.7.x to master #25503

merged 57 commits into from
Mar 16, 2018

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from dev15.7.x into master.

git fetch --all
git checkout merges/dev15.7.x-to-master
git reset --hard upstream/master
git merge upstream/dev15.7.x
# Fix merge conflicts
git commit
git push merges/dev15.7.x-to-master --force

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

VSadov and others added 12 commits March 11, 2018 14:21
[stackalloc-init] Symbol API tests
Merge 'features/compiler' into stackalloc-init
Merging Dev15.7.x into features/stackalloc-init
Merge from dev15.7.x into features/stackalloc-inits
Merging features/stackalloc-init into  dev15.7.x
There is no props file in this package to Import. Having the Import here is breaking our ability to publish in official builds.
Remove props file reference
@dotnet-bot dotnet-bot requested review from a team as code owners March 15, 2018 20:58
@Shyam-Gupta
Copy link
Member

Test failures in windows_coreclr_release_prtest:
https://ci.dot.net/job/dotnet_roslyn/job/master/job/windows_coreclr_release_prtest/52/

Rerunning to see if these are flaky

@Shyam-Gupta
Copy link
Member

@dotnet-bot retest windows_coreclr_release_prtest please

@Shyam-Gupta
Copy link
Member

@dotnet-bot retest windows_coreclr_debug_prtest please

@Shyam-Gupta
Copy link
Member

These test failures looks genuine as they are failing in every build. They got added recently: https://github.com/dotnet/roslyn/blob/dev15.7.x/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenStackAllocInitializerTests.cs

@333fred
Copy link
Member

333fred commented Mar 16, 2018

@VSadov @alrz, can you guys please take a look at these test failures?

@333fred
Copy link
Member

333fred commented Mar 16, 2018

Note: to get better formatted output, head to the test failure, and copy the output into a program that will allow you to search for \\r\\n and replace with \r\n, like Notepad++ in extended search mode. The failure from windows_coreclr_debug_prtest TestReadonlySpan formatted readably:

Expected:
{
  // Code size       37 (0x25)
  .maxstack  4
  .locals init (int V_0)
  IL_0000:  ldc.i4.3
  IL_0001:  stloc.0
  IL_0002:  ldloc.0
  IL_0003:  conv.u
  IL_0004:  ldc.i4.4
  IL_0005:  mul.ovf.un
  IL_0006:  localloc
  IL_0008:  dup
  IL_0009:  ldc.i4.1
  IL_000a:  stind.i4
  IL_000b:  dup
  IL_000c:  ldc.i4.4
  IL_000d:  add
  IL_000e:  ldc.i4.2
  IL_000f:  stind.i4
  IL_0010:  dup
  IL_0011:  ldc.i4.2
  IL_0012:  conv.i
  IL_0013:  ldc.i4.4
  IL_0014:  mul
  IL_0015:  add
  IL_0016:  ldc.i4.3
  IL_0017:  stind.i4
  IL_0018:  ldloc.0
  IL_0019:  newobj     \"\"System.Span<int>..ctor(void*, int)\"\"
  IL_001e:  call       \"\"System.ReadOnlySpan<int> System.ReadOnlySpan<int>.op_Implicit(System.Span<int>)\"\"
  IL_0023:  pop
  IL_0024:  ret
}
Actual:
{
  // Code size       34 (0x22)
  .maxstack  4
  IL_0000:  ldc.i4.s   12
  IL_0002:  conv.u
  IL_0003:  localloc
  IL_0005:  dup
  IL_0006:  ldc.i4.1
  IL_0007:  stind.i4
  IL_0008:  dup
  IL_0009:  ldc.i4.4
  IL_000a:  add
  IL_000b:  ldc.i4.2
  IL_000c:  stind.i4
  IL_000d:  dup
  IL_000e:  ldc.i4.2
  IL_000f:  conv.i
  IL_0010:  ldc.i4.4
  IL_0011:  mul
  IL_0012:  add
  IL_0013:  ldc.i4.3
  IL_0014:  stind.i4
  IL_0015:  ldc.i4.3
  IL_0016:  newobj     \"\"System.Span<int>..ctor(void*, int)\"\"
  IL_001b:  call       \"\"System.ReadOnlySpan<int> System.ReadOnlySpan<int>.op_Implicit(System.Span<int>)\"\"
  IL_0020:  pop
  IL_0021:  ret
}
Differences:
    {
++>   // Code size       34 (0x22)
-->   // Code size       37 (0x25)
      .maxstack  4
++>   IL_0000:  ldc.i4.s   12
++>   IL_0002:  conv.u
++>   IL_0003:  localloc
++>   IL_0005:  dup
++>   IL_0006:  ldc.i4.1
++>   IL_0007:  stind.i4
-->   .locals init (int V_0)
-->   IL_0000:  ldc.i4.3
-->   IL_0001:  stloc.0
-->   IL_0002:  ldloc.0
-->   IL_0003:  conv.u
-->   IL_0004:  ldc.i4.4
-->   IL_0005:  mul.ovf.un
-->   IL_0006:  localloc
      IL_0008:  dup
++>   IL_0009:  ldc.i4.4
++>   IL_000a:  add
++>   IL_000b:  ldc.i4.2
++>   IL_000c:  stind.i4
++>   IL_000d:  dup
-->   IL_0009:  ldc.i4.1
-->   IL_000a:  stind.i4
-->   IL_000b:  dup
-->   IL_000c:  ldc.i4.4
-->   IL_000d:  add
      IL_000e:  ldc.i4.2
++>   IL_000f:  conv.i
++>   IL_0010:  ldc.i4.4
++>   IL_0011:  mul
++>   IL_0012:  add
++>   IL_0013:  ldc.i4.3
++>   IL_0014:  stind.i4
++>   IL_0015:  ldc.i4.3
++>   IL_0016:  newobj     \"\"System.Span<int>..ctor(void*, int)\"\"
++>   IL_001b:  call       \"\"System.ReadOnlySpan<int> System.ReadOnlySpan<int>.op_Implicit(System.Span<int>)\"\"
++>   IL_0020:  pop
++>   IL_0021:  ret
-->   IL_000f:  stind.i4
-->   IL_0010:  dup
-->   IL_0011:  ldc.i4.2
-->   IL_0012:  conv.i
-->   IL_0013:  ldc.i4.4
-->   IL_0014:  mul
-->   IL_0015:  add
-->   IL_0016:  ldc.i4.3
-->   IL_0017:  stind.i4
-->   IL_0018:  ldloc.0
-->   IL_0019:  newobj     \"\"System.Span<int>..ctor(void*, int)\"\"
-->   IL_001e:  call       \"\"System.ReadOnlySpan<int> System.ReadOnlySpan<int>.op_Implicit(System.Span<int>)\"\"
-->   IL_0023:  pop
-->   IL_0024:  ret
    }

Expected: True
Actual:   False

@VSadov
Copy link
Member

VSadov commented Mar 16, 2018

These failures are expected. IL is better in master because of #24183
The test baselines need to be updated.

I'll try making the change

@VSadov
Copy link
Member

VSadov commented Mar 16, 2018

@dotnet-bot test windows_release_vs-integration_prtest please

@VSadov
Copy link
Member

VSadov commented Mar 16, 2018

@dotnet-bot test windows_debug_vs-integration_prtest please

@VSadov
Copy link
Member

VSadov commented Mar 16, 2018

@dotnet-bot test windows_debug_unit64_prtest please

@VSadov VSadov merged commit 216993f into master Mar 16, 2018
@VSadov VSadov deleted the merges/dev15.7.x-to-master branch March 16, 2018 06:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants