Simplify the `tcx.alloc_map` API #71508

oli-obk · 2020-04-24T10:54:17Z

This PR changes all functions that require manually locking the alloc_map to functions on TyCtxt that lock the map internally. In the same step we make the TyCtxt::alloc_map field private.

r? @RalfJung

rust-highfive · 2020-04-24T12:48:59Z

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-04-24T10:54:49.2940283Z ========================== Starting Command Output ===========================
2020-04-24T10:54:49.2943837Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/4b32c694-8f05-4d62-8ad5-1d5f2c376027.sh
2020-04-24T10:54:49.2944302Z 
2020-04-24T10:54:49.2948442Z ##[section]Finishing: Disable git automatic line ending conversion
2020-04-24T10:54:49.2970014Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/71508/merge to s
2020-04-24T10:54:49.2973659Z Task         : Get sources
2020-04-24T10:54:49.2973948Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-04-24T10:54:49.2974226Z Version      : 1.0.0
2020-04-24T10:54:49.2974416Z Author       : Microsoft
---
2020-04-24T10:54:50.2843746Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-04-24T10:54:50.2850087Z ##[command]git config gc.auto 0
2020-04-24T10:54:50.2854234Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-04-24T10:54:50.2857485Z ##[command]git config --get-all http.proxy
2020-04-24T10:54:50.2863885Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/71508/merge:refs/remotes/pull/71508/merge
---
2020-04-24T10:57:52.1874244Z  ---> f7353ccad5b1
2020-04-24T10:57:52.1874502Z Step 6/7 : ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
2020-04-24T10:57:52.1876367Z  ---> Using cache
2020-04-24T10:57:52.1876771Z  ---> ed38efbaa060
2020-04-24T10:57:52.1910449Z Step 7/7 : ENV SCRIPT python3 ../x.py test src/tools/expand-yaml-anchors &&            python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu &&            python3 ../x.py build --stage 0 src/tools/build-manifest &&            python3 ../x.py test --stage 0 src/tools/compiletest &&            python3 ../x.py test src/tools/tidy &&            /scripts/validate-toolstate.sh
2020-04-24T10:57:52.1911816Z  ---> c5008ef7ae8e
2020-04-24T10:57:52.1912017Z Successfully built c5008ef7ae8e
2020-04-24T10:57:52.1951531Z Successfully tagged rust-ci:latest
2020-04-24T10:57:52.2239378Z Built container sha256:c5008ef7ae8e94d7ef502e3cef26e61208e14ebdb36913f3a8bb86291bd6430b
2020-04-24T10:57:52.2239378Z Built container sha256:c5008ef7ae8e94d7ef502e3cef26e61208e14ebdb36913f3a8bb86291bd6430b
2020-04-24T10:57:52.2253893Z Looks like docker image is the same as before, not uploading
2020-04-24T10:57:58.7344007Z [CI_JOB_NAME=mingw-check]
2020-04-24T10:57:58.7588091Z [CI_JOB_NAME=mingw-check]
2020-04-24T10:57:58.7622588Z == clock drift check ==
2020-04-24T10:57:58.7628988Z   local time: Fri Apr 24 10:57:58 UTC 2020
2020-04-24T10:57:58.9246770Z   network time: Fri, 24 Apr 2020 10:57:58 GMT
2020-04-24T10:57:58.9270275Z Starting sccache server...
2020-04-24T10:57:59.0469189Z configure: processing command line
2020-04-24T10:57:59.0469967Z configure: 
2020-04-24T10:57:59.0471286Z configure: rust.parallel-compiler := True
---
2020-04-24T11:01:45.9674982Z     Checking rustc_feature v0.0.0 (/checkout/src/librustc_feature)
2020-04-24T11:01:46.1412563Z     Checking fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
2020-04-24T11:01:46.3420544Z     Checking rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
2020-04-24T11:01:46.3849741Z     Checking rustc_hir v0.0.0 (/checkout/src/librustc_hir)
2020-04-24T11:01:46.9981374Z     Checking rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
2020-04-24T11:01:49.3945182Z     Checking rustc_attr v0.0.0 (/checkout/src/librustc_attr)
2020-04-24T11:01:49.9188278Z     Checking rustc_parse v0.0.0 (/checkout/src/librustc_parse)
2020-04-24T11:01:51.9442097Z     Checking rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
2020-04-24T11:01:52.4004468Z     Checking rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
---
2020-04-24T11:03:42.9419048Z configure: dist.missing-tools   := True
2020-04-24T11:03:42.9419514Z configure: build.submodules     := False
2020-04-24T11:03:42.9420152Z configure: build.cargo-native-static := True
2020-04-24T11:03:42.9420812Z configure: build.locked-deps    := True
2020-04-24T11:03:42.9421575Z configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
2020-04-24T11:03:42.9422434Z configure: writing `config.toml` in current directory
2020-04-24T11:03:42.9422808Z configure: 
2020-04-24T11:03:42.9423383Z configure: run `python /checkout/x.py --help`
2020-04-24T11:03:42.9424017Z configure: 
---
2020-04-24T11:05:14.4273492Z Hugepagesize:       2048 kB
2020-04-24T11:05:14.4273695Z DirectMap4k:      147392 kB
2020-04-24T11:05:14.4273893Z DirectMap2M:     4046848 kB
2020-04-24T11:05:14.4274089Z DirectMap1G:     5242880 kB
2020-04-24T11:05:14.4301331Z + python3 ../x.py test src/tools/expand-yaml-anchors
2020-04-24T11:05:15.8505265Z Ensuring the YAML anchors in the GitHub Actions config were expanded
2020-04-24T11:05:15.8505265Z Ensuring the YAML anchors in the GitHub Actions config were expanded
2020-04-24T11:05:15.8538514Z Building stage0 tool expand-yaml-anchors (x86_64-unknown-linux-gnu)
2020-04-24T11:05:16.0941043Z    Compiling unicode-xid v0.2.0
2020-04-24T11:05:16.2426663Z    Compiling syn v1.0.11
2020-04-24T11:05:17.1257503Z    Compiling linked-hash-map v0.5.2
2020-04-24T11:05:17.1599666Z    Compiling lazy_static v1.4.0
2020-04-24T11:05:17.1599666Z    Compiling lazy_static v1.4.0
2020-04-24T11:05:17.3703909Z    Compiling yaml-rust v0.4.3
2020-04-24T11:05:21.7681997Z    Compiling quote v1.0.2
2020-04-24T11:05:36.3257176Z    Compiling thiserror-impl v1.0.5
2020-04-24T11:05:40.9988336Z    Compiling thiserror v1.0.5
2020-04-24T11:05:41.0628598Z    Compiling yaml-merge-keys v0.4.0
2020-04-24T11:05:42.2411476Z    Compiling expand-yaml-anchors v0.1.0 (/checkout/src/tools/expand-yaml-anchors)
2020-04-24T11:05:44.0477302Z Build completed successfully in 0:00:29
2020-04-24T11:05:44.0577528Z + python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu
2020-04-24T11:05:44.3271671Z     Finished dev [unoptimized] target(s) in 0.17s
2020-04-24T11:05:45.4525252Z Checking rustdoc artifacts (x86_64-unknown-linux-gnu -> i686-pc-windows-gnu)
---
2020-04-24T11:07:50.8558136Z     Checking rustc_feature v0.0.0 (/checkout/src/librustc_feature)
2020-04-24T11:07:50.9947420Z     Checking fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
2020-04-24T11:07:51.2048196Z     Checking rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
2020-04-24T11:07:51.2637017Z     Checking rustc_hir v0.0.0 (/checkout/src/librustc_hir)
2020-04-24T11:07:51.8980178Z     Checking rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
2020-04-24T11:07:54.2739745Z     Checking rustc_attr v0.0.0 (/checkout/src/librustc_attr)
2020-04-24T11:07:54.7811110Z     Checking rustc_parse v0.0.0 (/checkout/src/librustc_parse)
2020-04-24T11:07:57.5170205Z     Checking rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
2020-04-24T11:07:57.5194356Z     Checking rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
---
2020-04-24T11:12:02.0517378Z skip untracked path cpu-usage.csv during rustfmt invocations
2020-04-24T11:12:02.0517817Z skip untracked path src/doc/book/ during rustfmt invocations
2020-04-24T11:12:02.0518432Z skip untracked path src/doc/rust-by-example/ during rustfmt invocations
2020-04-24T11:12:02.0522834Z skip untracked path src/llvm-project/ during rustfmt invocations
2020-04-24T11:12:04.9702986Z Diff in /checkout/src/librustc_mir/const_eval/eval_queries.rs at line 200:
2020-04-24T11:12:04.9703338Z          // whether they become immediates.
2020-04-24T11:12:04.9703611Z          if is_static || cid.promoted.is_some() {
2020-04-24T11:12:04.9703864Z              let ptr = mplace.ptr.assert_ptr();
2020-04-24T11:12:04.9704759Z -            Ok(ConstValue::ByRef {
2020-04-24T11:12:04.9705268Z -                alloc: ecx.tcx.unwrap_memory(ptr.alloc_id),
2020-04-24T11:12:04.9705716Z -                offset: ptr.offset,
2020-04-24T11:12:04.9706065Z -            })
2020-04-24T11:12:04.9706434Z +            Ok(ConstValue::ByRef { alloc: ecx.tcx.unwrap_memory(ptr.alloc_id), offset: ptr.offset })
2020-04-24T11:12:04.9706763Z          } else {
2020-04-24T11:12:04.9706974Z              Ok(op_to_const(&ecx, mplace.into()))
2020-04-24T11:12:04.9707186Z          }
2020-04-24T11:12:04.9709121Z Running `"/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/rustfmt" "--config-path" "/checkout" "--edition" "2018" "--unstable-features" "--skip-children" "--check" "/checkout/src/librustc_mir/const_eval/eval_queries.rs"` failed.
2020-04-24T11:12:04.9710048Z If you're running `tidy`, try again with `--bless` flag. Or, you just want to format code, run `./x.py fmt` instead.
2020-04-24T11:12:04.9710793Z Build completed unsuccessfully in 0:00:40
2020-04-24T11:12:04.9742212Z == clock drift check ==
2020-04-24T11:12:04.9742212Z == clock drift check ==
2020-04-24T11:12:04.9756528Z   local time: Fri Apr 24 11:12:04 UTC 2020
2020-04-24T11:12:05.2642363Z   network time: Fri, 24 Apr 2020 11:12:05 GMT
2020-04-24T11:12:06.7629548Z 
2020-04-24T11:12:06.7629548Z 
2020-04-24T11:12:06.7700603Z ##[error]Bash exited with code '1'.
2020-04-24T11:12:06.7714542Z ##[section]Finishing: Run build
2020-04-24T11:12:06.7760514Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/71508/merge to s
2020-04-24T11:12:06.7765365Z Task         : Get sources
2020-04-24T11:12:06.7765674Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-04-24T11:12:06.7765953Z Version      : 1.0.0
2020-04-24T11:12:06.7766171Z Author       : Microsoft
2020-04-24T11:12:06.7766171Z Author       : Microsoft
2020-04-24T11:12:06.7766491Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-04-24T11:12:06.7766850Z ==============================================================================
2020-04-24T11:12:07.1317040Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-04-24T11:12:07.1366730Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/71508/merge to s
2020-04-24T11:12:07.1462876Z Cleaning up task key
2020-04-24T11:12:07.1464198Z Start cleaning up orphan processes.
2020-04-24T11:12:07.1661646Z Terminate orphan process: pid (3639) (python)
2020-04-24T11:12:07.1811632Z ##[section]Finishing: Finalize Job

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 @rust-lang/infra. (Feature Requests)

src/librustc_middle/mir/interpret/mod.rs

src/librustc_middle/ty/print/pretty.rs

src/librustc_middle/mir/interpret/mod.rs

RalfJung · 2020-05-08T19:24:09Z

src/librustc_middle/mir/mod.rs

-                Some(GlobalAlloc::Static(def_id)) => Some(def_id),
-                Some(_) => None,
-                None => {
-                    tcx.sess.delay_span_bug(DUMMY_SP, "MIR cannot contain dangling const pointers");


This turns a delay_bug into a bug! -- let's see if we can get away with that. ;)

RalfJung · 2020-05-08T19:25:35Z

src/librustc_middle/mir/interpret/mod.rs

+            GlobalAlloc::Function(instance) => instance,
+            _ => bug!("expected function, got {:?}", self),
+        }
+    }


For symmetry, should we have unwrap_static?

I considered it, but found no possible use sites, thus left it out.

Fair enough.

RalfJung · 2020-05-08T20:33:10Z

@bors r+

bors · 2020-05-08T20:33:11Z

📌 Commit b07a44d has been approved by RalfJung

@ghost

Rollup of 5 pull requests Successful merges: - rust-lang#69406 (upgrade chalk and use chalk-solve/chalk-ir/chalk-rust-ir) - rust-lang#71185 (Move tests from `test/run-fail` to UI) - rust-lang#71234 (rustllvm: Use .init_array rather than .ctors) - rust-lang#71508 (Simplify the `tcx.alloc_map` API) - rust-lang#71555 (Remove ast::{Ident, Name} reexports.) Failed merges: r? @ghost

Update to rustc changes changes needed once rust-lang/rust#71508 gets merged

rust-highfive assigned RalfJung Apr 24, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 24, 2020

oli-obk force-pushed the alloc_map_unlock branch from 321a378 to c12029c Compare April 24, 2020 14:33

RalfJung reviewed Apr 24, 2020

View reviewed changes

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

RalfJung reviewed Apr 24, 2020

View reviewed changes

src/librustc_middle/mir/interpret/mod.rs Show resolved Hide resolved

RalfJung reviewed Apr 24, 2020

View reviewed changes

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

RalfJung reviewed Apr 24, 2020

View reviewed changes

src/librustc_middle/ty/print/pretty.rs Outdated Show resolved Hide resolved

RalfJung 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-review Status: Awaiting review from the assignee but also interested parties. labels May 1, 2020

oli-obk added 4 commits May 8, 2020 10:59

Simplify the tcx.alloc_map API

38ae8f3

Move unwrap_fn and unwrap_memory to GlobalAlloc

1037f40

Shrink visibility of the AllocMap and its methods

4572d32

Create a convenience wrapper for get_global_alloc(id).unwrap()

43fcd7d

oli-obk force-pushed the alloc_map_unlock branch from 8bd82d4 to 43fcd7d Compare May 8, 2020 11:52

oli-obk added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 8, 2020

oli-obk force-pushed the alloc_map_unlock branch from b008a0c to 43fcd7d Compare May 8, 2020 15:00

This was referenced May 8, 2020

Update to rustc changes rust-lang/miri#1402

Merged

Make TLS accesses explicit in MIR #71192

Merged

RalfJung reviewed May 8, 2020

View reviewed changes

src/librustc_middle/mir/interpret/mod.rs Show resolved Hide resolved

RalfJung reviewed May 8, 2020

View reviewed changes

Document global_alloc

b07a44d

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 May 8, 2020

RalfJung mentioned this pull request May 9, 2020

Rollup of 5 pull requests #72041

Merged

bors merged commit 8c0310d into rust-lang:master May 9, 2020

bors added a commit to rust-lang/miri that referenced this pull request May 10, 2020

Auto merge of #1402 - rust-lang:alloc_map_unlock, r=RalfJung

4cbe1f4

Update to rustc changes changes needed once rust-lang/rust#71508 gets merged

JohnTitor mentioned this pull request Nov 2, 2020

ICE: compiler/rustc_middle/src/mir/mod.rs:2306:49: could not find allocation for alloc1 #78655

Closed

oli-obk deleted the alloc_map_unlock branch March 16, 2021 12:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Simplify the `tcx.alloc_map` API #71508

Simplify the `tcx.alloc_map` API #71508

oli-obk commented Apr 24, 2020 •

edited

Loading

rust-highfive commented Apr 24, 2020

RalfJung May 8, 2020

RalfJung May 8, 2020

oli-obk May 8, 2020

RalfJung May 8, 2020

RalfJung commented May 8, 2020

bors commented May 8, 2020

Simplify the tcx.alloc_map API #71508

Simplify the tcx.alloc_map API #71508

Conversation

oli-obk commented Apr 24, 2020 • edited Loading

rust-highfive commented Apr 24, 2020

RalfJung May 8, 2020

Choose a reason for hiding this comment

RalfJung May 8, 2020

Choose a reason for hiding this comment

oli-obk May 8, 2020

Choose a reason for hiding this comment

RalfJung May 8, 2020

Choose a reason for hiding this comment

RalfJung commented May 8, 2020

bors commented May 8, 2020

Simplify the `tcx.alloc_map` API #71508

Simplify the `tcx.alloc_map` API #71508

oli-obk commented Apr 24, 2020 •

edited

Loading