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

Move resolve_instance to rustc_ty. #69100

Merged
merged 1 commit into from
Feb 14, 2020
Merged

Conversation

cjgillot
Copy link
Contributor

r? @Zoxc

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 12, 2020
@Zoxc
Copy link
Contributor

Zoxc commented Feb 12, 2020

These don't really belong in rustc_resolve. I'd put them in rustc_ty instead.

) -> Option<Instance<'tcx>>,
> = AtomicRef::new(
&(resolve_instance_default
as for<'tcx> fn(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you do a as _ cast here?

@Zoxc
Copy link
Contributor

Zoxc commented Feb 12, 2020

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion

@bors
Copy link
Contributor

bors commented Feb 12, 2020

⌛ Trying commit aa5110ebd87a0763bd82878cda9f4dabf97577a8 with merge 88a34075007e6282f2e3cbb00a9c27e2d85df7ab...

@bors
Copy link
Contributor

bors commented Feb 12, 2020

☀️ Try build successful - checks-azure
Build commit: 88a34075007e6282f2e3cbb00a9c27e2d85df7ab (88a34075007e6282f2e3cbb00a9c27e2d85df7ab)

@rust-timer
Copy link
Collaborator

Queued 88a34075007e6282f2e3cbb00a9c27e2d85df7ab with parent 2ed25f0, future comparison URL.

@cjgillot cjgillot changed the title Move resolve_instance to rustc_resolve. Move resolve_instance to rustc_ty. Feb 12, 2020
@bors
Copy link
Contributor

bors commented Feb 12, 2020

☔ The latest upstream changes (presumably #68679) made this pull request unmergeable. Please resolve the merge conflicts.

@cjgillot
Copy link
Contributor Author

What should be done with the perf result?

@petrochenkov
Copy link
Contributor

@cjgillot
Could you squash the commits before this PR is merged, so it doesn't pollute rustc_resolve history?

@cjgillot
Copy link
Contributor Author

Squashed.

@Zoxc
Copy link
Contributor

Zoxc commented Feb 14, 2020

The performance overhead will be fixed by #67797 so I'm just going to approve this.

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Feb 14, 2020

📌 Commit 0e652c5 has been approved by Zoxc

@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 Feb 14, 2020
@bors
Copy link
Contributor

bors commented Feb 14, 2020

⌛ Testing commit 0e652c5 with merge f31a7da...

bors added a commit that referenced this pull request Feb 14, 2020
Move resolve_instance to rustc_ty.

r? @Zoxc
@rust-highfive
Copy link
Collaborator

The job i686-msvc-2 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.
2020-02-14T12:44:17.6073976Z failures:
2020-02-14T12:44:17.6074107Z 
2020-02-14T12:44:17.6074273Z ---- [ui] ui\proc-macro\attributes-on-modules-fail.rs stdout ----
2020-02-14T12:44:17.6074397Z 
2020-02-14T12:44:17.6074586Z error: auxiliary build of "D:\\a\\1\\s\\src/test\\ui\\proc-macro\\auxiliary\\test-macros.rs" failed to compile: 
2020-02-14T12:44:17.6074767Z status: exit code: 1
2020-02-14T12:44:17.6076269Z command: PATH="D:\a\1\s\build\i686-pc-windows-msvc\stage2\bin;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64;D:\a\1\s\build\i686-pc-windows-msvc\stage0-bootstrap-tools\i686-pc-windows-msvc\release\deps;D:\a\1\s\build\i686-pc-windows-msvc\stage0\bin;D:\a\1\s\msys2\mingw32\bin;D:\a\1\s\ninja;D:\a\1\s\msys2\mingw32\bin;C:\Python27amd64;D:\a\1\s\msys2\usr\bin;C:\Program Files (x86)\Inno Setup 5;D:\a\1\s\sccache;C:\agents\2.164.8\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:\ProgramData\kind;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\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:\Program Files (x86)\sbt\bin;C:\Rust\.cargo\bin;C:\hostedtoolcache\windows\Ruby\2.5.7\x64\bin;C:\Go1.12.7\bin;C:\Program Files\Git\bin;C:\hostedtoolcache\windows\Python\3.6.8\x64\Scripts;C:\hostedtoolcache\windows\Python\3.6.8\x64;C:\npm\prefix;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\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\tools\php;C:\Program Files (x86)\sbt\bin;C:\Program Files (x86)\Subversion\bin;C:\SeleniumWebDrivers\ChromeDriver;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\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "D:\\a\\1\\s\\src/test\\ui\\proc-macro\\auxiliary\\test-macros.rs" "-Zthreads=1" "--target=i686-pc-windows-msvc" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--out-dir" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "-L" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary"
2020-02-14T12:44:17.6077705Z ------------------------------------------
2020-02-14T12:44:17.6077824Z 
2020-02-14T12:44:17.6077975Z ------------------------------------------
2020-02-14T12:44:17.6078112Z stderr:
2020-02-14T12:44:17.6078112Z stderr:
2020-02-14T12:44:17.6078262Z ------------------------------------------
2020-02-14T12:44:17.6078416Z error: linking with `link.exe` failed: exit code: 0xc0000005
2020-02-14T12:44:17.6078575Z    |
2020-02-14T12:44:17.6082240Z    = note: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\bin\\HostX64\\x86\\link.exe" "/NOLOGO" "/NXCOMPAT" "/LARGEADDRESSAWARE" "/SAFESEH" "/LIBPATH:C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.0.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.1.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.10.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.11.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.12.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.13.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.14.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.15.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.2.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.3.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.4.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.5.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.6.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.7.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.8.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.test_macros.3a1fbbbh-cgu.9.rcgu.o" "/OUT:D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test_macros.dll" "/DEF:C:\\Users\\VSSADM~1\\AppData\\Local\\Temp\\rustccTXi5f\\lib.def" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.ervvtsa2aryxa58.rcgu.o" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test-macros.3bnz0zaf7f69rvzk.rcgu.o" "/OPT:REF,ICF" "/DEBUG" "/LIBPATH:D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "/LIBPATH:D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary" "/LIBPATH:C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib" "C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\libproc_macro-a36ec901d4af1e58.rlib" "C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\libstd-ec939d9006a537bd.rlib" "C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\libpanic_unwind-18e87ddcc4b12c1f.rlib" "C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\libhashbrown-355a918856190ee9.rlib" "C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\librustc_std_workspace_alloc-27cd21863378d9ea.rlib" "C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\libbacktrace-8baf36440a25da3a.rlib" "C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\librustc_demangle-87a4ca2366547693.rlib" "C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\libunwind-c6a42db55eb6dfea.rlib" "C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\libcfg_if-4cf8fc203d34279d.rlib" "C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\liblibc-e89ef8a791e4967c.rlib" "C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\liballoc-0a0ca582eafa2dc4.rlib" "C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\librustc_std_workspace_core-ef0d0123ef117e88.rlib" "C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\libcore-9d5c2d4baab9e81e.rlib" "C:\\MORE_SPACE\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\libcompiler_builtins-1eeecdba22dc7916.rlib" "advapi32.lib" "ws2_32.lib" "userenv.lib" "msvcrt.lib" "/DLL" "/IMPLIB:D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\proc-macro\\attributes-on-modules-fail\\auxiliary\\test_macros.dll.lib"
2020-02-14T12:44:17.6085347Z 
2020-02-14T12:44:17.6085486Z error: aborting due to previous error
2020-02-14T12:44:17.6085622Z 
2020-02-14T12:44:17.6085735Z 
---
2020-02-14T12:44:17.6103494Z thread 'main' panicked at 'Some tests failed', src\tools\compiletest\src\main.rs:348:22
2020-02-14T12:44:17.6104568Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-02-14T12:44:17.6133148Z 
2020-02-14T12:44:17.6133235Z 
2020-02-14T12:44:17.6134023Z command did not execute successfully: "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\stage0-tools-bin\\compiletest.exe" "--compile-lib-path" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\stage2\\bin" "--run-lib-path" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib" "--rustc-path" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "--src-base" "D:\\a\\1\\s\\src/test\\ui" "--build-base" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui" "--stage-id" "stage2-i686-pc-windows-msvc" "--mode" "ui" "--target" "i686-pc-windows-msvc" "--host" "i686-pc-windows-msvc" "--llvm-filecheck" "D:\\a\\1\\s\\build\\i686-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\\i686-pc-windows-msvc\\native\\rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "--docck-python" "D:\\a\\1\\s\\msys2\\mingw32\\bin\\python2.7" "--lldb-python" "D:\\a\\1\\s\\msys2\\mingw32\\bin\\python2.7" "--gdb" "D:\\a\\1\\s\\msys2\\mingw32\\bin\\gdb" "--llvm-version" "9.0.1-rust-1.43.0-nightly\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2020-02-14T12:44:17.6135215Z 
2020-02-14T12:44:17.6135346Z 
2020-02-14T12:44:18.5207399Z failed to run: D:\a\1\s\build\bootstrap\debug\bootstrap test src/test/ui src/test/compile-fail src/tools/linkchecker
2020-02-14T12:44:18.5207624Z Build completed unsuccessfully in 1:36:36
2020-02-14T12:44:18.5207624Z Build completed unsuccessfully in 1:36:36
2020-02-14T12:44:18.5208010Z make: *** [Makefile:82: ci-subset-2] Error 1
2020-02-14T12:44:18.5233908Z   local time: Fri Feb 14 12:44:17 CUT 2020
2020-02-14T12:44:18.5234148Z   network time: Fri, 14 Feb 2020 12:44:18 GMT
2020-02-14T12:44:18.5234235Z == end clock drift check ==
2020-02-14T12:44:18.5234278Z 
2020-02-14T12:44:18.5234278Z 
2020-02-14T12:44:18.6935177Z ##[error]Bash exited with code '2'.
2020-02-14T12:44:18.7259129Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-02-14T12:44:18.8193635Z ==============================================================================
2020-02-14T12:44:18.8193756Z Task         : Get sources
2020-02-14T12:44:18.8193855Z 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 Feb 14, 2020

💔 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 Feb 14, 2020
@Zoxc
Copy link
Contributor

Zoxc commented Feb 14, 2020

@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 Feb 14, 2020
@bors
Copy link
Contributor

bors commented Feb 14, 2020

⌛ Testing commit 0e652c5 with merge 35071e3...

bors added a commit that referenced this pull request Feb 14, 2020
Move resolve_instance to rustc_ty.

r? @Zoxc
@bors
Copy link
Contributor

bors commented Feb 14, 2020

☀️ Test successful - checks-azure
Approved by: Zoxc
Pushing 35071e3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 14, 2020
@bors bors merged commit 0e652c5 into rust-lang:master Feb 14, 2020
@cjgillot cjgillot deleted the resolve_instance branch February 14, 2020 21:40
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.

6 participants