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

Fix #64153 #65435

Merged
merged 3 commits into from
Oct 29, 2019
Merged

Fix #64153 #65435

merged 3 commits into from
Oct 29, 2019

Conversation

michaelwoerister
Copy link
Member

This PR changes how the compiler detects if an object file from an upstream crate is a Rust object file or not. Instead of checking if the name starts with the crate name and ends with .o (which is not always the case, as described in #64153), it now just checks if the filename ends with .rcgu.o.

This fixes #64153. However, ideally we'd clean up the code around filename generation some more. Then this check could be made more robust.

r? @alexcrichton

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 15, 2019
@Centril
Copy link
Contributor

Centril commented Oct 15, 2019

@bors rollup=never (I have bad experience with adding -fulldeps tests)

@michaelwoerister
Copy link
Member Author

@bors rollup=never (I have bad experience with adding -fulldeps tests)

Yes, I can imagine :)

@alexcrichton
Copy link
Member

@bors: r+

Seems reasonable to me!

@bors
Copy link
Contributor

bors commented Oct 15, 2019

📌 Commit af05b23 has been approved by alexcrichton

@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 Oct 15, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 15, 2019
…=alexcrichton

Fix rust-lang#64153

This PR changes how the compiler detects if an object file from an upstream crate is a Rust object file or not. Instead of checking if the name starts with the crate name and ends with `.o` (which is not always the case, as described in rust-lang#64153), it now just checks if the filename ends with `.rcgu.o`.

This fixes rust-lang#64153. However, ideally we'd clean up the code around filename generation some more. Then this check could be made more robust.

r? @alexcrichton
Centril added a commit to Centril/rust that referenced this pull request Oct 15, 2019
…=alexcrichton

Fix rust-lang#64153

This PR changes how the compiler detects if an object file from an upstream crate is a Rust object file or not. Instead of checking if the name starts with the crate name and ends with `.o` (which is not always the case, as described in rust-lang#64153), it now just checks if the filename ends with `.rcgu.o`.

This fixes rust-lang#64153. However, ideally we'd clean up the code around filename generation some more. Then this check could be made more robust.

r? @alexcrichton
@tmandry
Copy link
Member

tmandry commented Oct 15, 2019

Failed in #65451, @bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 15, 2019
@michaelwoerister
Copy link
Member Author

This probably fails because nm produces a different output on macOS. I'll take a closer look when I get ahold of a mac.

@michaelwoerister
Copy link
Member Author

I've switched the test from nm to llvm-objdump which should have platform-independent output.

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Oct 22, 2019

📌 Commit 52eda13 has been approved by alexcrichton

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 22, 2019
@bors
Copy link
Contributor

bors commented Oct 26, 2019

⌛ Testing commit 52eda13 with merge 9d20e2f668a08e655cd20a838e9b3f447baabe03...

@rust-highfive
Copy link
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-10-26T04:09:53.7025687Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-10-26T04:09:53.7025972Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-10-26T04:09:53.7031480Z 
2019-10-26T04:09:53.7035517Z Failures
2019-10-26T04:09:53.7043198Z  - msys2 (exited 1) - msys2 not installed. An error occurred during installation:
2019-10-26T04:09:53.7043515Z  The remote server returned an error: (503) Server Unavailable. Service Unavailable
2019-10-26T04:09:54.2236864Z 
2019-10-26T04:09:54.2406214Z ##[error]Bash exited with code '1'.
2019-10-26T04:09:54.2643178Z ##[section]Starting: Upload CPU usage statistics
2019-10-26T04:09:54.2755895Z ==============================================================================
2019-10-26T04:09:54.2756034Z Task         : Bash
2019-10-26T04:09:54.2756127Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-10-26T04:09:54.5843400Z ========================== Starting Command Output ===========================
2019-10-26T04:09:54.5848566Z [command]"C:\Program Files\Git\bin\bash.exe" --noprofile --norc /d/a/_temp/e588f7a8-bb10-4c24-beeb-88e6d26393d9.sh
2019-10-26T04:09:54.6289207Z /d/a/_temp/e588f7a8-bb10-4c24-beeb-88e6d26393d9.sh: line 1: aws: command not found
2019-10-26T04:09:54.6319532Z 
2019-10-26T04:09:54.6340843Z ##[error]Bash exited with code '127'.
2019-10-26T04:09:54.6420142Z ##[section]Starting: Checkout
2019-10-26T04:09:54.6519784Z ==============================================================================
2019-10-26T04:09:54.6519870Z Task         : Get sources
2019-10-26T04:09:54.6519975Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Oct 26, 2019

💔 Test failed - checks-azure

@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 Oct 26, 2019
@JohnTitor
Copy link
Member

It's a network error.
@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 Oct 26, 2019
@bors
Copy link
Contributor

bors commented Oct 27, 2019

⌛ Testing commit 52eda13 with merge c3e2c99ed1b324674c598be9d919e48793039707...

@rust-highfive
Copy link
Collaborator

The job x86_64-msvc-1 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-10-27T09:33:46.7487741Z test [run-make] run-make-fulldeps\windows-subsystem ... ok
2019-10-27T09:33:46.7488170Z 
2019-10-27T09:33:46.7488389Z failures:
2019-10-27T09:33:46.7488725Z 
2019-10-27T09:33:46.7489890Z ---- [run-make] run-make-fulldeps\issue-64153 stdout ----
2019-10-27T09:33:46.7490277Z error: make failed
2019-10-27T09:33:46.7490412Z status: exit code: 2
2019-10-27T09:33:46.7490576Z command: "make"
2019-10-27T09:33:46.7490710Z stdout:
2019-10-27T09:33:46.7490710Z stdout:
2019-10-27T09:33:46.7490865Z ------------------------------------------
2019-10-27T09:33:46.7491049Z make[1]: Entering directory '/d/a/1/s/src/test/run-make-fulldeps/issue-64153'
2019-10-27T09:33:46.7493067Z PATH="/d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/issue-64153/issue-64153:D:\a\1\s\build\x86_64-pc-windows-msvc\stage2\bin:/c/Program Files (x86)/Windows Kits/10/bin/x64:/c/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x64:/c/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Tools/MSVC/14.16.27023/bin/HostX64/x64:/d/a/1/s/build/x86_64-pc-windows-msvc/stage0-bootstrap-tools/x86_64-pc-windows-msvc/release/deps:/d/a/1/s/build/x86_64-pc-windows-msvc/stage0/bin:/d/a/1/s/ninja:/c/Python27amd64:/mingw64/bin:/usr/bin:/c/Program Files (x86)/Inno Setup 5:/d/a/1/s/sccache:/c/agents/2.159.2/externals/git/cmd:/c/hostedtoolcache/windows/Python/3.6.8/x64:/c/hostedtoolcache/windows/Python/3.6.8/x64/Scripts:/c/Program Files/Mercurial:/c/vcpkg:/c/cf-cli:/c/Program Files (x86)/NSIS:/c/Program Files/Mercurial:/c/Program Files/Boost/1.69.0:/c/Program Files/dotnet:/c/mysql-5.7.21-winx64/bin:/c/Program Files/Java/zulu-8-azure-jdk_8.40.0.25-8.0.222-win_x64/bin:/c/npm/prefix:/c/Rust/.cargo/bin:/c/hostedtoolcache/windows/Ruby/2.5.5/x64/bin:/c/Go1.12.7/bin:/c/Program Files/Git/bin:/c/Program Files/Git/usr/bin:/c/Program Files/Git/mingw64/bin:/c/hostedtoolcache/windows/Python/3.6.8/x64/Scripts:/c/hostedtoolcache/windows/Python/3.6.8/x64:/c/Program Files (x86)/Microsoft SDKs/Azure/CLI2/wbin:/c/Program Files/Microsoft MPI/Bin:/c/windows/system32:/c/windows:/c/windows/System32/Wbem:/c/windows/System32/WindowsPowerShell/v1.0:/c/ProgramData/Chocolatey/bin:/c/Program Files/Docker:/c/Program Files/PowerShell/6:/c/Program Files/dotnet:/c/Program Files/Microsoft SQL Server/130/Tools/Binn:/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 (x86)/Windows Kits/10/Windows Performance Toolkit:/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/tools/php:/c/Program Files (x86)/Subversion/bin:/c/Program Files/nodejs:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.2/bin:/c/Program Files/CMake/bin:/c/Strawberry/c/bin:/c/Strawberry/perl/site/bin:/c/Strawberry/perl/bin:/c/Program Files/OpenSSL/bin:/c/Users/VssAdministrator/.dotnet/tools:/c/Program" 'D:\a\1\s\build\x86_64-pc-windows-msvc\stage2\bin\rustc.exe' --out-dir /d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/issue-64153/issue-64153 -L /d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/issue-64153/issue-64153  --crate-type rlib upstream.rs -o /d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/issue-64153/issue-64153/libupstream.rlib -Ccodegen-units=1
2019-10-27T09:33:46.7497667Z PATH="/d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/issue-64153/issue-64153:D:\a\1\s\build\x86_64-pc-windows-msvc\stage2\bin:/c/Program Files (x86)/Windows Kits/10/bin/x64:/c/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x64:/c/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Tools/MSVC/14.16.27023/bin/HostX64/x64:/d/a/1/s/build/x86_64-pc-windows-msvc/stage0-bootstrap-tools/x86_64-pc-windows-msvc/release/deps:/d/a/1/s/build/x86_64-pc-windows-msvc/stage0/bin:/d/a/1/s/ninja:/c/Python27amd64:/mingw64/bin:/usr/bin:/c/Program Files (x86)/Inno Setup 5:/d/a/1/s/sccache:/c/agents/2.159.2/externals/git/cmd:/c/hostedtoolcache/windows/Python/3.6.8/x64:/c/hostedtoolcache/windows/Python/3.6.8/x64/Scripts:/c/Program Files/Mercurial:/c/vcpkg:/c/cf-cli:/c/Program Files (x86)/NSIS:/c/Program Files/Mercurial:/c/Program Files/Boost/1.69.0:/c/Program Files/dotnet:/c/mysql-5.7.21-winx64/bin:/c/Program Files/Java/zulu-8-azure-jdk_8.40.0.25-8.0.222-win_x64/bin:/c/npm/prefix:/c/Rust/.cargo/bin:/c/hostedtoolcache/windows/Ruby/2.5.5/x64/bin:/c/Go1.12.7/bin:/c/Program Files/Git/bin:/c/Program Files/Git/usr/bin:/c/Program Files/Git/mingw64/bin:/c/hostedtoolcache/windows/Python/3.6.8/x64/Scripts:/c/hostedtoolcache/windows/Python/3.6.8/x64:/c/Program Files (x86)/Microsoft SDKs/Azure/CLI2/wbin:/c/Program Files/Microsoft MPI/Bin:/c/windows/system32:/c/windows:/c/windows/System32/Wbem:/c/windows/System32/WindowsPowerShell/v1.0:/c/ProgramData/Chocolatey/bin:/c/Program Files/Docker:/c/Program Files/PowerShell/6:/c/Program Files/dotnet:/c/Program Files/Microsoft SQL Server/130/Tools/Binn:/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 (x86)/Windows Kits/10/Windows Performance Toolkit:/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/tools/php:/c/Program Files (x86)/Subversion/bin:/c/Program Files/nodejs:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.2/bin:/c/Program Files/CMake/bin:/c/Strawberry/c/bin:/c/Strawberry/perl/site/bin:/c/Strawberry/perl/bin:/c/Program Files/OpenSSL/bin:/c/Users/VssAdministrator/.dotnet/tools:/c/Program" 'D:\a\1\s\build\x86_64-pc-windows-msvc\stage2\bin\rustc.exe' --out-dir /d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/issue-64153/issue-64153 -L /d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/issue-64153/issue-64153  --crate-type staticlib downstream.rs -Clto -Ccodegen-units=1 -o /d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/issue-64153/issue-64153/libdownstream.a
2019-10-27T09:33:46.7498886Z # Dump all the symbols from the staticlib into `syms`
2019-10-27T09:33:46.7499326Z "D:\a\1\s\build\x86_64-pc-windows-msvc\llvm\build\bin"/llvm-objdump -t /d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/issue-64153/issue-64153/libdownstream.a > /d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/issue-64153/issue-64153/syms
2019-10-27T09:33:46.7499590Z # Count the global instances of `issue64153_test_function`. There'll be 2
2019-10-27T09:33:46.7499754Z # if the `upstream` object file got erronously included twice.
2019-10-27T09:33:46.7499949Z # The line we are testing for with the regex looks something like:
2019-10-27T09:33:46.7500110Z # 0000000000000000 g     F .text.issue64153_test_function 00000023 issue64153_test_function
2019-10-27T09:33:46.7500371Z grep -c -e "[[:space:]]g[[:space:]]*F[[:space:]].*issue64153_test_function" /d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/issue-64153/issue-64153/syms > /d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/issue-64153/issue-64153/count
2019-10-27T09:33:46.7500630Z make[1]: Leaving directory '/d/a/1/s/src/test/run-make-fulldeps/issue-64153'
2019-10-27T09:33:46.7501121Z ------------------------------------------
2019-10-27T09:33:46.7501496Z stderr:
2019-10-27T09:33:46.7538208Z ------------------------------------------
2019-10-27T09:33:46.7538208Z ------------------------------------------
2019-10-27T09:33:46.7538447Z warning: ignoring --out-dir flag due to -o flag
2019-10-27T09:33:46.7538587Z 
2019-10-27T09:33:46.7538730Z warning: ignoring --out-dir flag due to -o flag
2019-10-27T09:33:46.7538857Z 
2019-10-27T09:33:46.7538989Z make[1]: *** [Makefile:21: all] Error 1
2019-10-27T09:33:46.7539440Z ------------------------------------------
2019-10-27T09:33:46.7539734Z 
2019-10-27T09:33:46.7539827Z 
2019-10-27T09:33:46.7539921Z 
---
2019-10-27T09:33:46.7540873Z thread 'main' panicked at 'Some tests failed', src\tools\compiletest\src\main.rs:537:22
2019-10-27T09:33:46.7541069Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-10-27T09:33:46.7541194Z 
2019-10-27T09:33:46.7541288Z 
2019-10-27T09:33:46.7542940Z command did not execute successfully: "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\stage0-tools-bin\\compiletest.exe" "--compile-lib-path" "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\stage2\\bin" "--run-lib-path" "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib" "--rustc-path" "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\stage2\\bin\\rustc.exe" "--rustdoc-path" "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\stage2\\bin\\rustdoc.exe" "--src-base" "D:\\a\\1\\s\\src/test\\run-make-fulldeps" "--build-base" "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\test\\run-make-fulldeps" "--stage-id" "stage2-x86_64-pc-windows-msvc" "--mode" "run-make" "--target" "x86_64-pc-windows-msvc" "--host" "x86_64-pc-windows-msvc" "--llvm-filecheck" "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\llvm\\build\\bin\\FileCheck.exe" "--nodejs" "C:\\Program Files\\nodejs\\node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\native\\rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\native\\rust-test-helpers" "--docck-python" "C:\\Python27amd64\\python2.7" "--lldb-python" "C:\\Python27amd64\\python2.7" "--gdb" "D:\\a\\msys2\\mingw64\\bin\\gdb" "--llvm-version" "9.0.0-rust-1.40.0-dev\n" "--cc" "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\bin\\HostX64\\x64\\cl.exe" "--cxx" "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\bin\\HostX64\\x64\\cl.exe" "--cflags" "/nologo /MT" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter binaryformat bitreader bitstreamreader bitwriter codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver engine executionengine fuzzmutate globalisel gtest gtest_main hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interpreter ipo irreader jitlink libdriver lineeditor linker lto mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvutils runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target testingsupport textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86utils xray" "--llvm-cxxflags" "-ID:\\a\\1\\s\\src\\llvm-project\\llvm\\include -ID:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\llvm\\build\\include    /EHs-c- /GR- -D_DEBUG_POINTER_IMPL= -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -DUNICODE -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" "--llvm-bin-dir" "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\llvm\\build\\bin" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-10-27T09:33:46.7548444Z 
2019-10-27T09:33:46.7548560Z 
2019-10-27T09:33:46.7548560Z 
2019-10-27T09:33:46.8393340Z failed to run: D:\a\1\s\build\bootstrap\debug\bootstrap test --exclude src/test/ui --exclude src/test/compile-fail --exclude src/tools/linkchecker
2019-10-27T09:33:46.8394045Z Build completed unsuccessfully in 2:08:42
2019-10-27T09:33:46.8711278Z make: *** [Makefile:80: ci-subset-1] Error 1
2019-10-27T09:33:46.9209207Z   local time: Sun Oct 27 09:33:46 CUT 2019
2019-10-27T09:33:47.2256239Z   network time: Sun, 27 Oct 2019 09:33:47 GMT
2019-10-27T09:33:47.2278246Z == end clock drift check ==
2019-10-27T09:33:47.3314486Z 
2019-10-27T09:33:47.3314486Z 
2019-10-27T09:33:47.7656330Z ##[error]Bash exited with code '2'.
2019-10-27T09:33:47.8506598Z ##[section]Starting: Upload CPU usage statistics
2019-10-27T09:33:47.9419483Z ==============================================================================
2019-10-27T09:33:47.9419622Z Task         : Bash
2019-10-27T09:33:47.9419706Z Description  : Run a Bash script on macOS, Linux, or Windows

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Oct 27, 2019

💔 Test failed - checks-azure

@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 Oct 27, 2019
@michaelwoerister
Copy link
Member Author

Added # ignore-windows to the test since checking on other platforms should be sufficient for preventing a regression.

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Oct 28, 2019

📌 Commit a63dfb3 has been approved by alexcrichton

@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 Oct 28, 2019
@bors
Copy link
Contributor

bors commented Oct 29, 2019

⌛ Testing commit a63dfb3 with merge eb5ef81...

bors added a commit that referenced this pull request Oct 29, 2019
Fix #64153

This PR changes how the compiler detects if an object file from an upstream crate is a Rust object file or not. Instead of checking if the name starts with the crate name and ends with `.o` (which is not always the case, as described in #64153), it now just checks if the filename ends with `.rcgu.o`.

This fixes #64153. However, ideally we'd clean up the code around filename generation some more. Then this check could be made more robust.

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Oct 29, 2019

☀️ Test successful - checks-azure
Approved by: alexcrichton
Pushing eb5ef81 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 29, 2019
@bors bors merged commit a63dfb3 into rust-lang:master Oct 29, 2019
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.

ThinLTO and -o compiler option can lead to duplicate object file inclusion in staticlib
7 participants