Some cleanups around `AllocId` management#56461

oli-obk · 2018-12-03T15:21:13Z

… pointers to the same function

src/librustc/mir/interpret/mod.rs

RalfJung · 2018-12-04T08:36:08Z

src/librustc/mir/interpret/mod.rs

    }

-    pub fn get(&self, id: AllocId) -> Option<AllocType<'tcx, M>> {
+    /// Returns `None` in case the `AllocId` is dangling.


"Dangling" for the global memory only, right? It could still be allocated in the local (EvalContext) memory?

Yes, but the local memory will never hit the global one if it has that AllocId locally.

Sure, I just think the comment should explain what "dangling" means here.

src/librustc/mir/interpret/mod.rs

RalfJung

LGTM!

RalfJung · 2018-12-11T10:03:59Z

@bors r+

bors · 2018-12-11T10:04:00Z

📌 Commit 7181aa1 has been approved by RalfJung

bors · 2018-12-11T23:32:20Z

⌛ Testing commit 7181aa1 with merge 91d4020bff9ffad6472bb681b9954fd1f117a640...

bors · 2018-12-11T23:34:04Z

💔 Test failed - status-appveyor

rust-highfive · 2018-12-11T23:36:07Z

Your PR failed on Travis (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.

Checking out files: 100% (17616/17616), done.
travis_time:end:04d358e4:start=1544571267205753000,finish=1544571277078950000,duration=9873197000
$ cd rust-lang/rust
$ git checkout -qf 91d4020bff9ffad6472bb681b9954fd1f117a640
fatal: reference is not a tree: 91d4020bff9ffad6472bb681b9954fd1f117a640
The command "git checkout -qf 91d4020bff9ffad6472bb681b9954fd1f117a640" failed and exited with 128 during .
Your build has been stopped.

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)

alexcrichton · 2018-12-11T23:47:36Z

@bors: retry

CI automation hiccup

bors · 2018-12-12T00:39:07Z

💔 Test failed - status-appveyor

alexcrichton · 2018-12-12T01:13:02Z

@bors: retry

bors · 2018-12-13T09:47:22Z

⌛ Testing commit 7181aa1 with merge 28e4bc8dc355df2e8c84eb90424985adebc383bc...

bors · 2018-12-13T11:36:10Z

💔 Test failed - status-travis

rust-highfive · 2018-12-13T11:36:12Z

The job x86_64-gnu-aux of your PR failed on Travis (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.

[01:40:25] 
[01:40:25] testing https://github.com/servo/servo
[01:40:25] Initialized empty Git repository in /checkout/obj/build/ct/servo/.git/
[01:40:25] fatal: Could not parse object '987e376ca7a4245dbc3e0c06e963278ee1ac92d1'.
[01:44:41] fatal: unable to access 'https://github.com/servo/servo/': gnutls_handshake() failed: Error in the pull function.
[01:44:41] thread 'main' panicked at 'assertion failed: status.success()', src/tools/cargotest/main.rs:124:13
[01:44:41] 
[01:44:41] 
[01:44:41] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/cargotest" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "/checkout/obj/build/ct"
[01:44:41] expected success, got: exit code: 101
[01:44:41] expected success, got: exit code: 101
[01:44:41] 
[01:44:41] 
[01:44:41] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/test/pretty src/test/run-pass/pretty src/test/run-fail/pretty src/test/run-pass-valgrind/pretty src/test/run-pass-fulldeps/pretty src/test/run-fail-fulldeps/pretty src/tools/cargo src/tools/cargotest
[01:44:41] Build completed unsuccessfully in 0:41:46
[01:44:41] make: *** [check-aux] Error 1
[01:44:41] Makefile:60: recipe for target 'check-aux' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0bdab0ee
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Dec 13 11:34:31 UTC 2018
---
travis_time:end:05576886:start=1544700875076760122,finish=1544700875086218243,duration=9458121
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0a31331f
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:start:crashlog
obj/cores/core.30920.!checkout!obj!build!x86_64-unknown-linux-gnu!stage2!bin!rustc
[New LWP 30920]
warning: Could not load shared library symbols for 8 libraries, e.g. /lib/x86_64-linux-gnu/libc.so.6.
Use the "info sharedlibrary" command to see the complete listing.
Do you need "set solib-search-path" or "set sysroot"?
Core was generated by `rustc --crate-name foo src/lib.rs --color never --crate-type lib --emit=dep-inf'.
Program terminated with signal SIGABRT, Aborted.
#0  0x00007fb5d9685428 in ?? ()
#0  0x00007fb5d9685428 in ?? ()
#1  0x00007fb5d968702a in ?? ()
#2  0x0000000000000020 in ?? ()
#3  0x0000000000000000 in ?? ()
travis_time:end:0a31331f:start=1544700875094678603,finish=1544700876752001708,duration=1657323105
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:046e63b2
travis_time:start:046e63b2
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0b3ae0c0
$ dmesg | grep -i kill

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)

oli-obk · 2018-12-13T11:43:55Z

@bors retry network/tls error

bors · 2018-12-13T12:36:20Z

⌛ Testing commit 7181aa1 with merge 7489ee9...

@eddyb

Some cleanups around `AllocId` management r? @eddyb cc @RalfJung

kennytm · 2018-12-13T15:36:18Z

@bors ping

bors · 2018-12-13T15:36:19Z

😪 I'm awake I'm awake

alexcrichton · 2018-12-13T16:31:54Z

tests passed, bors hiccup, merging manually

rust-highfive · 2018-12-13T16:33:33Z

📣 Toolstate changed by #56461!

Tested on commit 7489ee9.
Direct link to PR: #56461

💔 miri on windows: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
🎉 rls on linux: test-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).

@oli-obk

Tested on commit rust-lang/rust@7489ee9. Direct link to PR: <rust-lang/rust#56461> 💔 miri on windows: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra). 🎉 rls on linux: test-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).

bors · 2018-12-13T16:36:21Z

💥 Test timed out

oli-obk added 4 commits December 3, 2018 14:54

Monomorphize AllocMap struct

a5e57c8

Monomorphize AllocType

3074fcb

Function pointers are only equal to themselves, not to other function…

f6b3eb0

… pointers to the same function

Document AllocMap

3d278e9

rust-highfive assigned eddyb Dec 3, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 3, 2018

eddyb reviewed Dec 3, 2018

View reviewed changes

src/librustc/mir/interpret/mod.rs Outdated Show resolved Hide resolved

oli-obk added 2 commits December 3, 2018 16:30

s/AllocKind/AllocDiscriminant/

a1e83a9

s/AllocType/AllocKind/

2e00d64

RalfJung reviewed Dec 4, 2018

View reviewed changes

src/librustc/mir/interpret/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed Dec 4, 2018

View reviewed changes

s/alloc_type/alloc_kind/

d625019

RalfJung reviewed Dec 4, 2018

View reviewed changes

src/librustc/mir/interpret/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed Dec 4, 2018

View reviewed changes

src/librustc/mir/interpret/mod.rs Outdated Show resolved Hide resolved

oli-obk added 4 commits December 4, 2018 09:58

Clear up comment

66b2353

s/id_to_type/id_to_kind/

760df2c

Mention alloc in the name of the interning methods

982a966

No need to export functions only used in the same module

7181aa1

RalfJung approved these changes Dec 4, 2018

View reviewed changes

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 Dec 11, 2018

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 Dec 11, 2018

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 Dec 12, 2018

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 Dec 12, 2018

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 Dec 13, 2018

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 Dec 13, 2018

bors added a commit that referenced this pull request Dec 13, 2018

Auto merge of #56461 - oli-obk:alloc_ids, r=RalfJung

7489ee9

Some cleanups around `AllocId` management r? @eddyb cc @RalfJung

alexcrichton merged commit 7181aa1 into rust-lang:master Dec 13, 2018

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 Dec 13, 2018

RalfJung mentioned this pull request Dec 13, 2018

fix for latest nightly rust-lang/miri#574

Merged

kennytm mentioned this pull request Dec 18, 2018

Automatically open an issue when a tool breaks #56951

Merged

SimonSapin mentioned this pull request Dec 27, 2018

Call poly_project_and_unify_type on types that contain inference types #56838

Merged

oli-obk deleted the alloc_ids branch June 15, 2020 15:29

Uh oh!

Conversation

oli-obk commented Dec 3, 2018

Uh oh!

Uh oh!

Uh oh!

RalfJung Dec 4, 2018

Choose a reason for hiding this comment

Uh oh!

oli-obk Dec 4, 2018

Choose a reason for hiding this comment

Uh oh!

RalfJung Dec 4, 2018

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

RalfJung left a comment

Choose a reason for hiding this comment

Uh oh!

RalfJung commented Dec 11, 2018

Uh oh!

bors commented Dec 11, 2018

Uh oh!

bors commented Dec 11, 2018

Uh oh!

bors commented Dec 11, 2018

Uh oh!

rust-highfive commented Dec 11, 2018

Uh oh!

alexcrichton commented Dec 11, 2018

Uh oh!

bors commented Dec 12, 2018

Uh oh!

alexcrichton commented Dec 12, 2018

Uh oh!

bors commented Dec 13, 2018

Uh oh!

bors commented Dec 13, 2018

Uh oh!

rust-highfive commented Dec 13, 2018

Uh oh!

oli-obk commented Dec 13, 2018

Uh oh!

bors commented Dec 13, 2018

Uh oh!

kennytm commented Dec 13, 2018

Uh oh!

bors commented Dec 13, 2018

Uh oh!

alexcrichton commented Dec 13, 2018

Uh oh!

rust-highfive commented Dec 13, 2018

Uh oh!

bors commented Dec 13, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants