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

Update libc to 0.2.121 #95688

Merged
merged 1 commit into from
Apr 7, 2022
Merged

Update libc to 0.2.121 #95688

merged 1 commit into from
Apr 7, 2022

Conversation

pfmooney
Copy link
Contributor

@pfmooney pfmooney commented Apr 5, 2022

With the updated libc, UNIX stack overflow handling in libstd can now
use the common si_addr accessor function, rather than attempting to
use a field from that name in siginfo_t. This simplifies the
collection of the fault address, particularly on platforms where that
data resides within a union in siginfo_t.

With the updated libc, UNIX stack overflow handling in libstd can now
use the common `si_addr` accessor function, rather than attempting to
use a field from that name in `siginfo_t`.  This simplifies the
collection of the fault address, particularly on platforms where that
data resides within a union in `siginfo_t`.
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 5, 2022
@pfmooney pfmooney mentioned this pull request Apr 5, 2022
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 6, 2022

📌 Commit 33fd73f has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 6, 2022
@Mark-Simulacrum
Copy link
Member

@bors rollup=never

@bors
Copy link
Contributor

bors commented Apr 6, 2022

⌛ Testing commit 33fd73f with merge 09c5cdd5809ae6ff82074d6059d780bbae5c696b...

@bors
Copy link
Contributor

bors commented Apr 6, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 6, 2022
@rust-log-analyzer
Copy link
Collaborator

The job i686-msvc-1 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
---- [ui] ui-fulldeps\stdio-from.rs stdout ----

error: test run failed!
status: exit code: 101
command: PATH="D:\a\rust\rust\build\i686-pc-windows-msvc\stage2\lib\rustlib\i686-pc-windows-msvc\lib;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64;C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\bin\HostX64\x86;D:\a\rust\rust\build\i686-pc-windows-msvc\stage0-bootstrap-tools\i686-pc-windows-msvc\release\deps;D:\a\rust\rust\build\i686-pc-windows-msvc\stage0\bin;D:\a\rust\rust\ninja;D:\a\rust\rust\msys2\mingw32\bin;C:\hostedtoolcache\windows\Python\3.10.4\x64\Scripts;C:\hostedtoolcache\windows\Python\3.10.4\x64;C:\msys64\usr\bin;D:\a\rust\rust\sccache;C:\Program Files\MongoDB\Server\5.0\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.7.5\x64;C:\cabal\bin;C:\ghcup\bin;C:\tools\ghc-9.2.2\bin;C:\Program Files\dotnet;C:\mysql\bin;C:\Program Files\R\R-4.1.3\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;C:\Program Files (x86)\sbt\bin;C:\Program Files (x86)\GitHub CLI;C:\Program Files\Git\bin;C:\Program Files (x86)\pipx_bin;C:\hostedtoolcache\windows\go\1.15.15\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.322-6\x64\bin;C:\npm\prefix;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\Docker;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\dotnet;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files\nodejs;C:\Program Files\OpenSSL\bin;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\ProgramData\chocolatey\lib\pulumi\tools\Pulumi\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\CMake\bin;C:\ProgramData\chocolatey\lib\maven\apache-maven-3.8.5\bin;C:\Program Files\Microsoft Service Fabric\bin\Fabric\Fabric.Code;C:\Program Files\Microsoft SDKs\Service Fabric\Tools\ServiceFabricLocalClusterManager;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI;C:\tools\php;C:\Program Files (x86)\sbt\bin;C:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\ui-fulldeps\\stdio-from\\a.exe"
stdout: none
--- stderr -------------------------------
I/O error: operation failed to complete synchronously
thread 'main' panicked at 'assertion failed: child2.wait()?.success()', D:\a\rust\rust\src/test\ui-fulldeps\stdio-from.rs:50:5
------------------------------------------




failures:
    [ui] ui-fulldeps\stdio-from.rs

test result: FAILED. 65 passed; 1 failed; 1 ignored; 0 measured; 0 filtered out; finished in 25.15s

Build completed unsuccessfully in 0:35:13
make: *** [Makefile:72: ci-subset-1] Error 1

@glaubitz
Copy link
Contributor

glaubitz commented Apr 6, 2022

Hmm, that failure looks like an artifact. Maybe retry?

@klensy
Copy link
Contributor

klensy commented Apr 6, 2022

Error the same, as in #95737. Error message introduced in #95469, so @ChrisDenton

@Dylan-DPC
Copy link
Member

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 6, 2022
@bors
Copy link
Contributor

bors commented Apr 7, 2022

⌛ Testing commit 33fd73f with merge 846993e...

@bors
Copy link
Contributor

bors commented Apr 7, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 846993e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 7, 2022
@bors bors merged commit 846993e into rust-lang:master Apr 7, 2022
@rustbot rustbot added this to the 1.62.0 milestone Apr 7, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (846993e): comparison url.

Summary:

  • Primary benchmarks: changes not relevant. 8 results were found to be statistically significant but the changes were too small to be relevant.
  • Secondary benchmarks: changes not relevant. 19 results were found to be statistically significant but the changes were too small to be relevant.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@ChrisDenton
Copy link
Member

@klensy I've written a quick bug report (#95759) describing what I think is the root cause and will investigate further. #95469 may need to be temporarily reverted to unblock CI if it can't be fixed quickly.

@Dylan-DPC
Copy link
Member

@ChrisDenton the CI issue seems to be resolved though

@ChrisDenton
Copy link
Member

The failures are intermittent. Sometimes the test passes, sometimes it doesn't (it depends on whether the reads/writes complete synchronously or not).

@Dylan-DPC
Copy link
Member

yeh that's fair i meant it's not blocking the CI so doesn't have to be reverted in a hurry

bors added a commit to rust-lang/libc that referenced this pull request Apr 9, 2022
Disable broken CI jobs

These are temporarily removed until someone comes to fix them.

The semver jobs have been broken for over a year now, but are ignored by bors. Now we just disable them completely since they cause confusion when reading the build logs.

The uclibc targets were recently broken by rust-lang/rust#95688. They are missing a `si_addr()` function on `struct siginfo`.
bors added a commit to rust-lang/libc that referenced this pull request Apr 10, 2022
Disable broken CI jobs

These are temporarily removed until someone comes to fix them.

The semver jobs have been broken for over a year now, but are ignored by bors. Now we just disable them completely since they cause confusion when reading the build logs.

The uclibc targets were recently broken by rust-lang/rust#95688. They are missing a `si_addr()` function on `struct siginfo`.
bors added a commit to rust-lang/libc that referenced this pull request Apr 10, 2022
Disable broken CI jobs

These are temporarily removed until someone comes to fix them.

The semver jobs have been broken for over a year now, but are ignored by bors. Now we just disable them completely since they cause confusion when reading the build logs.

The uclibc targets were recently broken by rust-lang/rust#95688. They are missing a `si_addr()` function on `struct siginfo`.
bors added a commit to rust-lang/libc that referenced this pull request Apr 10, 2022
Disable broken CI jobs

These are temporarily removed until someone comes to fix them.

The semver jobs have been broken for over a year now, but are ignored by bors. Now we just disable them completely since they cause confusion when reading the build logs.

The uclibc targets were recently broken by rust-lang/rust#95688. They are missing a `si_addr()` function on `struct siginfo`.
@Dylan-DPC
Copy link
Member

@ChrisDenton any plans on reverting? seeing this issue too frequently in the last few days that's annoying especially in rollups

@ChrisDenton
Copy link
Member

I had my hopes on #95841 but it's not been reviewed yet. I guess it being a weekend doesn't help.

bors added a commit to rust-lang/libc that referenced this pull request Apr 12, 2022
Add siginfo accessors for uclibc

With rust-lang/rust#95688 switching to the libc-provided `si_addr()` accessor on `siginfo_t`, it became apparent that the uclibc target was lacking that implementation (see rust-lang/rust#95866).

It would be nice to provide the same accessor in uclibc as the other UNIX-y platforms.

CC: `@asomers` `@name1e5s` `@skrap` - If you have a testing env for this, could you try it out?
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.