Future-proof the compiler for Box<T, A>. by eddyb · Pull Request #47043 · rust-lang/rust

eddyb · 2017-12-28T06:19:54Z

@Ericson2314 is playing around with Box<T, A = Heap> and there is still some special-casing in the compiler around Box, some of which is removed by this PR.
Ideally we can merge this before the beta cutoff to avoid needing a cfg(stage0) copy of Box.

r? @alexcrichton

Ericson2314 · 2017-12-28T06:23:21Z

For the record, Work is https://github.com/QuiltOS/rust/tree/allocator-error and described at #32838 (comment)

I'll kick off the rustc before I go to sleep, and test against my branch in the morning

Thanks again @eddyb!

Ericson2314 · 2017-12-28T16:21:42Z

@eddyb tested and everything indeed builds! I guess I should make a toy executable next?

eddyb · 2017-12-29T01:00:16Z

Added one more commit to allow changing box_free's signature. r? @nikomatsakis

Ericson2314 · 2017-12-29T03:57:12Z

@eddyb, with or without the functionality you specified (which I put in in alloc::string)

#[unstable(feature = "asdfasdf", issue = "12345678")]#[derive(Debug)]pubstructFooAlloc(usize);#[unstable(feature = "asdfasdf", issue = "12345678")]unsafeimpl::allocator::AllocforFooAlloc{typeErr = !;unsafefnalloc(&mutself,layout:::allocator::Layout) -> Result<*mutu8,Self::Err>{::abort_adapter::AbortAdapter(::heap::Heap).alloc(layout)}unsafefndealloc(&mutself,ptr:*mutu8,layout:::allocator::Layout){::abort_adapter::AbortAdapter(::heap::Heap).dealloc(ptr, layout)}}#[unstable(feature = "asdfasdf", issue = "12345678")]pubfnfoo(x:Box<String,FooAlloc>,y:bool){if y {let _x = *x;}}

I get, when compiled with the old box_free:

thread 'rustc' panicked at 'assertion failed: sig.variadic || extra_args.is_empty()', src/librustc_trans/abi.rs:736:13

With the fixed box_free, however, everything works correctly!

eddyb · 2018-01-02T17:37:15Z

@rust-lang/infra There's no way for this to get into beta, is there?

alexcrichton · 2018-01-02T18:05:00Z

@eddyb this can be backported like most other backports, right?

Ericson2314 · 2018-01-02T18:18:28Z

@alexcrichton I'd think so. it works with the standard library as it exists today.

eddyb · 2018-01-02T18:27:58Z

To be clear, I mean get into the nightly and then make the cut into the next beta. Backporting it after the cut seems okay-ish, assuming it gets a proper review from @nikomatsakis or someone else.

Ericson2314 · 2018-01-02T18:57:35Z

Hmm yeah the point would be to have it in beta for the sake of bootstrapping nightly, not to eventually get it into beta so that it makes stable but nightly needs to wait for the next beta.

nikomatsakis · 2018-01-03T19:15:06Z

@bors r+

This is a big PR to backport, though, and not entirely trivial.

bors · 2018-01-03T19:15:08Z

📌 Commit 99bf699 has been approved by nikomatsakis

bors · 2018-01-03T23:55:35Z

⌛ Testing commit 99bf699 with merge a48c0980b61fdac7ee026c9e34a7d47e1d6fafcd...

bors · 2018-01-04T01:34:26Z

💔 Test failed - status-appveyor

kennytm · 2018-01-04T10:53:49Z

The backtrace tests failed on i686-pc-windows-msvc, maybe legit. These two tests are passing on x86_64-pc-windows-msvc and i686-pc-windows-gnu.

Details

failures:
---- [run-pass] run-pass\backtrace-debuginfo.rs stdout ----
error: test run failed!
status: exit code: 101
command: PATH="C:\projects\rust\build\i686-pc-windows-msvc\stage2\lib\rustlib\i686-pc-windows-msvc\lib;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Windows Kits\10\bin\10.0.14393.0\x86;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64;C:\projects\rust\build\i686-pc-windows-msvc\stage0-tools\i686-pc-windows-msvc\release\deps;C:\projects\rust\build\i686-pc-windows-msvc\stage0-sysroot\lib\rustlib\i686-pc-windows-msvc\lib;C:\Program Files (x86)\Inno Setup 5;C:\Python27;C:\msys64\mingw32\bin;C:\msys64\usr\bin;C:\Perl\site\bin;C:\Perl\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Program Files\7-Zip;C:\Program Files\Microsoft\Web Platform Installer;C:\Tools\GitVersion;C:\Tools\PsTools;C:\Program Files\Git LFS;C:\Program Files (x86)\Subversion\bin;C:\Program Files\Microsoft SQL Server\120\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\110\Tools\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\Tools\Binn;C:\Program Files\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\Tools\Binn\ManagementStudio;C:\Tools\WebDriver;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.4;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\PrivateAssemblies;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI\wbin;C:\Ruby193\bin;C:\Tools\NUnit\bin;C:\Tools\xUnit;C:\Tools\MSpec;C:\Tools\Coverity\bin;C:\Program Files (x86)\CMake\bin;C:\go\bin;C:\Program Files\Java\jdk1.8.0\bin;C:\Python27;C:\Program Files\nodejs;C:\Program Files (x86)\iojs;C:\Program Files\iojs;C:\Users\appveyor\AppData\Roaming\npm;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Tools\NuGet;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft DNX\Dnvm;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files\Microsoft SQL Server\130\DTS\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)\Apache\Maven\bin;C:\Python27\Scripts;C:\Tools\NUnit3;C:\Program Files\Mercurial;C:\Program Files\LLVM\bin;C:\Program Files\dotnet;C:\Program Files\erl8.3\bin;C:\Tools\curl\bin;C:\Program Files\Amazon\AWSCLI;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\Extensions\Microsoft\SQLDB\DAC\140;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Tools\vcpkg;C:\Program Files\Microsoft Service Fabric\bin\Fabric\Fabric.Code;C:\Program Files\Microsoft SDKs\Service Fabric\Tools\ServiceFabricLocalClusterManager;C:\Program Files (x86)\Yarn\bin;C:\ProgramData\chocolatey\bin;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn;C:\Program Files\Microsoft SQL Server\140\Tools\Binn;C:\Program Files\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\nodejs;C:\Users\appveyor\AppData\Local\Yarn\bin;C:\Users\appveyor\AppData\Roaming\npm;C:\Program Files\AppVeyor\BuildAgent;C:\projects\rust;C:\projects\rust\handle" "C:\\projects\\rust\\build\\i686-pc-windows-msvc\\test\\run-pass\\backtrace-debuginfo.stage2-i686-pc-windows-msvc.exe"
stdout:
------------------------------------------
------------------------------------------
stderr:
------------------------------------------
thread 'main' panicked at 'trace does not match position list: test case 0
thread 'main' panicked at 'explicit panic', C:\projects\rust\src/test\run-pass\backtrace-debuginfo.rs:77:5
stack backtrace:
0: 0x7471399f - std::panicking::Location::column::h2aaafe34e8f24eb6
1: 0x74710f1f - <&'a T as core::fmt::Debug>::fmt::hfffa8a776ccdaf7b
2: 0x74713f71 - std::panicking::rust_panic_with_hook::h94e3079805c14424
3: 0x5affff - <unknown>
---
backtrace-debuginfo.rs:166
', C:\projects\rust\src/test\run-pass\backtrace-debuginfo.rs:132:5
note: Run with `RUST_BACKTRACE=1` for a backtrace.
------------------------------------------
thread '[run-pass] run-pass\backtrace-debuginfo.rs' panicked at 'explicit panic', src\tools\compiletest\src\runtest.rs:2776:8
note: Run with `RUST_BACKTRACE=1` for a backtrace.
---- [run-pass] run-pass\backtrace.rs stdout ----
error: test run failed!
status: exit code: 101
command: PATH="C:\projects\rust\build\i686-pc-windows-msvc\stage2\lib\rustlib\i686-pc-windows-msvc\lib;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Windows Kits\10\bin\10.0.14393.0\x86;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64;C:\projects\rust\build\i686-pc-windows-msvc\stage0-tools\i686-pc-windows-msvc\release\deps;C:\projects\rust\build\i686-pc-windows-msvc\stage0-sysroot\lib\rustlib\i686-pc-windows-msvc\lib;C:\Program Files (x86)\Inno Setup 5;C:\Python27;C:\msys64\mingw32\bin;C:\msys64\usr\bin;C:\Perl\site\bin;C:\Perl\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Program Files\7-Zip;C:\Program Files\Microsoft\Web Platform Installer;C:\Tools\GitVersion;C:\Tools\PsTools;C:\Program Files\Git LFS;C:\Program Files (x86)\Subversion\bin;C:\Program Files\Microsoft SQL Server\120\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\110\Tools\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\Tools\Binn;C:\Program Files\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\Tools\Binn\ManagementStudio;C:\Tools\WebDriver;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.4;C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\PrivateAssemblies;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI\wbin;C:\Ruby193\bin;C:\Tools\NUnit\bin;C:\Tools\xUnit;C:\Tools\MSpec;C:\Tools\Coverity\bin;C:\Program Files (x86)\CMake\bin;C:\go\bin;C:\Program Files\Java\jdk1.8.0\bin;C:\Python27;C:\Program Files\nodejs;C:\Program Files (x86)\iojs;C:\Program Files\iojs;C:\Users\appveyor\AppData\Roaming\npm;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Tools\NuGet;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft DNX\Dnvm;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files\Microsoft SQL Server\130\DTS\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)\Apache\Maven\bin;C:\Python27\Scripts;C:\Tools\NUnit3;C:\Program Files\Mercurial;C:\Program Files\LLVM\bin;C:\Program Files\dotnet;C:\Program Files\erl8.3\bin;C:\Tools\curl\bin;C:\Program Files\Amazon\AWSCLI;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\Extensions\Microsoft\SQLDB\DAC\140;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Tools\vcpkg;C:\Program Files\Microsoft Service Fabric\bin\Fabric\Fabric.Code;C:\Program Files\Microsoft SDKs\Service Fabric\Tools\ServiceFabricLocalClusterManager;C:\Program Files (x86)\Yarn\bin;C:\ProgramData\chocolatey\bin;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn;C:\Program Files\Microsoft SQL Server\140\Tools\Binn;C:\Program Files\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\nodejs;C:\Users\appveyor\AppData\Local\Yarn\bin;C:\Users\appveyor\AppData\Roaming\npm;C:\Program Files\AppVeyor\BuildAgent;C:\projects\rust;C:\projects\rust\handle" "C:\\projects\\rust\\build\\i686-pc-windows-msvc\\test\\run-pass\\backtrace.stage2-i686-pc-windows-msvc.exe"
stdout:
------------------------------------------
------------------------------------------
stderr:
------------------------------------------
thread 'main' panicked at 'bad output: thread 'main' panicked at 'explicit panic', C:\projects\rust\src/test\run-pass\backtrace.rs:25:9
stack backtrace:
0: std::panicking::Location::column
1: <&'a T as core::fmt::Debug>::fmt
2: std::panicking::rust_panic_with_hook
3: <unknown>
', C:\projects\rust\src/test\run-pass\backtrace.rs:60:5
note: Run with `RUST_BACKTRACE=1` for a backtrace.
------------------------------------------
thread '[run-pass] run-pass\backtrace.rs' panicked at 'explicit panic', src\tools\compiletest\src\runtest.rs:2776:8
failures:
[run-pass] run-pass\backtrace-debuginfo.rs
[run-pass] run-pass\backtrace.rs
test result: FAILED. 2857 passed; 2 failed; 22 ignored; 0 measured; 0 filtered out
thread 'main' panicked at 'Some tests failed', src\tools\compiletest\src\main.rs:476:21

eddyb · 2018-01-04T12:29:34Z

@alexcrichton IIRC, 32-bit x86 with MSVC uses a different unwinding scheme than GNU.
Is it possible it's sensitive to type debuginfo? AFAICT, that's the only relevant change.

alexcrichton · 2018-01-04T15:08:16Z

Hm maybe? It's true that the unwinding scheme of i686 MSVC is totally unique to that target, and I believe the method we acquire backtraces with does indeed require debug info (but unwinding doesn't require deubginfo). I wouldn't know where to start looking unfortunately though.

bors · 2018-01-05T20:15:43Z

📌 Commit 0ee960f has been approved by nikomatsakis

bors · 2018-01-05T20:16:16Z

⌛ Testing commit 0ee960f06f395b98520953546451ae82c15cb15b with merge 3dabf28fadecd61801897fcbbcdb482a57d810e9...

bors · 2018-01-05T21:57:20Z

💔 Test failed - status-appveyor

…meters.

eddyb · 2018-01-06T00:16:06Z

@bors r=nikomatsakis (now with the LLVM pointer types for Box<T: Sized> restored)

bors · 2018-01-06T00:16:06Z

📌 Commit 5043534 has been approved by nikomatsakis

bors · 2018-01-06T00:58:29Z

⌛ Testing commit 5043534 with merge 52ccf67a08c616959a3ff1fea81101a77a262acb...

bors · 2018-01-06T02:36:38Z

💔 Test failed - status-appveyor

eddyb · 2018-01-06T02:38:53Z

Oddly enough, with each try the backtraces get longer, but they're still mostly <unknown>.

shepmaster · 2018-01-13T00:38:00Z

Ping from triage, @eddyb! Any luck figuring out the build issues?

eddyb · 2018-01-13T05:00:57Z

@shepmaster Nope, although I could try to take a fresh look and poke at it some more.

bors · 2018-01-16T11:06:08Z

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

carols10cents · 2018-01-22T21:15:15Z

Triage ping for you @eddyb ! Looks like there are some merge conflicts for you too.

kennytm · 2018-01-31T09:53:39Z

Since this PR has been inactive for more than 2 weeks, I'm closing it to keep the queue clean. Feel free to reopen anytime once the build issues have been figured out.

@eddyb

Partial future-proofing for Box<T, A> In some ways, this is similar to @eddyb's PR #47043 that went stale, but doesn't cover everything. Notably, this still leaves Box internalized as a pointer in places, so practically speaking, only ZSTs can be practically added to the Box type with the changes here (the compiler ICEs otherwise). The Box type is not changed here, that's left for the future because I want to test that further first, but this puts things in place in a way that hopefully will make things easier.

rust-highfive assigned alexcrichton Dec 28, 2017

kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 28, 2017

Ericson2314 mentioned this pull request Dec 28, 2017
Allocator traits and std::heap #32838
Open
12 tasks

eddyb force-pushed the future-box branch from 2c87b6a to 99bf699Compare December 29, 2017 00:59

rust-highfive assigned nikomatsakis and unassigned alexcrichton Dec 29, 2017

nikomatsakis approved these changes Jan 3, 2018
View reviewed changes

kennytm 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 Jan 3, 2018

kennytm 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 Jan 4, 2018

rustc: remove an assortment of Box<T> special-cases.
d433da4

eddyb force-pushed the future-box branch from 99bf699 to 0ee960fCompare January 5, 2018 20:13

eddyb added 3 commits January 6, 2018 02:14

rustc_trans: don't special-case Box<T> to have T* LLVM types.
9e1a903

rustc: support owned_box lang items with more (defaulted) type para…
f63e30a
…meters.

rustc: support arbitrary Box definitions in box_free.
5043534

eddyb force-pushed the future-box branch from 0ee960f to 5043534Compare January 6, 2018 00:14

kennytm closed this Jan 31, 2018

kennytm added S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 31, 2018

Ericson2314 mentioned this pull request Feb 2, 2018
fallible collection allocation 1.0 rust-lang/rfcs#2116
Merged

Ericson2314 mentioned this pull request Mar 16, 2018
Refactor std to improve ease of porting rust-lang-nursery/portability-wg#1
Open

glandium mentioned this pull request Apr 20, 2018
Partial future-proofing for Box<T, A> #50097
Merged

Ericson2314 mentioned this pull request Jun 21, 2018
Associate an allocator to boxes #50882
Closed

This was referenced Jun 29, 2018
A pure alloc library, with today's alloc becoming global_allocrust-lang-nursery/portability-wg#20
Closed
Tracking issue for custom allocators in standard collections #42774
Closed

Uh oh!

Uh oh!

Conversation

eddyb commented Dec 28, 2017

Uh oh!

Ericson2314 commented Dec 28, 2017

Uh oh!

Ericson2314 commented Dec 28, 2017

Uh oh!

eddyb commented Dec 29, 2017

Uh oh!

Ericson2314 commented Dec 29, 2017• edited by eddyb Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

eddyb commented Jan 2, 2018

Uh oh!

alexcrichton commented Jan 2, 2018

Uh oh!

Ericson2314 commented Jan 2, 2018

Uh oh!

eddyb commented Jan 2, 2018

Uh oh!

Ericson2314 commented Jan 2, 2018

Uh oh!

nikomatsakis commented Jan 3, 2018

Uh oh!

bors commented Jan 3, 2018

Uh oh!

bors commented Jan 3, 2018

Uh oh!

bors commented Jan 4, 2018

Uh oh!

kennytm commented Jan 4, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

eddyb commented Jan 4, 2018

Uh oh!

alexcrichton commented Jan 4, 2018

Uh oh!

bors commented Jan 5, 2018

Uh oh!

bors commented Jan 5, 2018

Uh oh!

bors commented Jan 5, 2018

Uh oh!

eddyb commented Jan 6, 2018

Uh oh!

bors commented Jan 6, 2018

Uh oh!

bors commented Jan 6, 2018

Uh oh!

bors commented Jan 6, 2018

Uh oh!

eddyb commented Jan 6, 2018

Uh oh!

shepmaster commented Jan 13, 2018

Uh oh!

eddyb commented Jan 13, 2018

Uh oh!

bors commented Jan 16, 2018

Uh oh!

carols10cents commented Jan 22, 2018

Uh oh!

kennytm commented Jan 31, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Ericson2314 commented Dec 29, 2017•
edited by eddyb
Loading

kennytm commented Jan 4, 2018•
edited
Loading