Changes the type `mir::Mir` into `mir::Body` #60928

TheSirC · 2019-05-17T22:38:27Z

Fixes part 1 of #60229 (previously attempted in #60242).

I stumbled upon the issue and it seems that the previous attempt at solving it was not merged. This is a second try more up-to-date.

The commit should have changed comments as well.
At the time of writting, it passes the tidy and check tool.

rust-highfive · 2019-05-17T22:38:31Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @eddyb (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

eddyb · 2019-05-22T08:09:20Z

src/librustc/mir/visit.rs

@@ -71,7 +71,7 @@ macro_rules! make_mir_visitor {
            // Override these, and call `self.super_xxx` to revert back to the
            // default behavior.

-            fn visit_mir(&mut self, mir: & $($mutability)? Mir<'tcx>) {
+            fn visit_mir(&mut self, mir: & $($mutability)? Body<'tcx>) {


This and super_mir should be renamed to visit_body, and super_body, respectively.

Rodger that. Done in the last force push.

eddyb · 2019-05-22T08:10:48Z

src/test/run-pass/regions/regions-lub-ref-ref-rc.rs

    Ref(&'mir String),
    Owned(Rc<String>),
 }

-impl<'mir> CachedMir<'mir> {
+impl<'mir> CachedBody<'mir> {


No need to change this test - alternatively, CachedMir can be renamed to Cached, if you want.
(Since this is a reduction, where Mir was replaced with String)

Well received. Renamed to Cached then !

eddyb

r=me after a rebase and with nits fixed

TheSirC · 2019-05-22T17:24:02Z

@eddyb I rebased the branch with the modifications you asked to one commit.

eddyb · 2019-05-23T18:27:46Z

@TheSirC You still need to rebase on latest master, before I can approve the PR.

TheSirC · 2019-05-24T09:01:11Z

Sorry for the back-and-forth, just rebased. I will try to be reactive in case another one is needed.

rust-highfive · 2019-05-24T09:20:15Z

The job x86_64-gnu-llvm-6.0 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.

travis_time:end:0e00a7aa:start=1558688467617550443,finish=1558688470662037256,duration=3044486813
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[00:15:47]    Compiling rustc_allocator v0.0.0 (/checkout/src/librustc_allocator)
[00:15:49] error[E0433]: failed to resolve: use of undeclared type or module `AggregateKind`
[00:15:49]    --> src/librustc_mir/transform/const_prop.rs:537:38
[00:15:49]     |
[00:15:49] 537 |                             Box::new(AggregateKind::Tuple),
[00:15:49]     |                                      ^^^^^^^^^^^^^ use of undeclared type or module `AggregateKind`
[00:16:03] error: aborting due to previous error
[00:16:03] 
[00:16:03] For more information about this error, try `rustc --explain E0433`.
[00:16:03] error: Could not compile `rustc_mir`.
---
travis_time:end:16f2f0fa:start=1558689610583775473,finish=1558689610589161448,duration=5385975
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:2de6ab26
$ 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:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:07b8df90
travis_time:start:07b8df90
$ 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:12271400
$ 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)

TheSirC · 2019-05-24T09:33:59Z

Obviously in the rebase I messed up an import; normally fixed now. Let's see what Travis has to say !

eddyb · 2019-05-24T13:17:44Z

@bors r+

bors · 2019-05-24T13:17:45Z

📌 Commit 6d14e73 has been approved by eddyb

Changes the type `mir::Mir` into `mir::Body` Fixes part 1 of rust-lang#60229 (previously attempted in rust-lang#60242). I stumbled upon the issue and it seems that the previous attempt at solving it was not merged. This is a second try more up-to-date. The commit should have changed comments as well. At the time of writting, it passes the tidy and check tool.

@ghost

Rollup of 5 pull requests Successful merges: - rust-lang#60928 (Changes the type `mir::Mir` into `mir::Body`) - rust-lang#61035 (Avoid more symbol interning) - rust-lang#61036 (PGO - Add a smoketest for combining PGO with cross-language LTO.) - rust-lang#61077 (Don't arena-allocate static symbols.) - rust-lang#61080 (Ship profiler with windows-gnu) Failed merges: r? @ghost

bors · 2019-05-25T04:10:23Z

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

TheSirC · 2019-05-25T08:01:44Z

Should I rebase again ?

TheSirC · 2019-05-25T09:51:17Z

Rebased to fix conflicts. Tests were passing locally.

eddyb · 2019-05-25T11:25:10Z

@bors r+

bors · 2019-05-25T11:25:11Z

📌 Commit d5f7181 has been approved by eddyb

src/librustc_mir/transform/promote_consts.rs

eddyb · 2019-05-28T20:08:17Z

src/librustc_mir/borrow_check/location.rs

@@ -1,4 +1,4 @@
-use rustc::mir::{BasicBlock, Location, Mir};
+use rustc::mir::{BasicBlock, Location, Body};


I don't remember if @oli-obk wanted to leave this for another PR (or maybe I never asked for this before), but IMO Body shouldn't be referred to as anything other than mir::Body outside of the module it's defined in.

src/librustc/ty/steal.rs

eddyb · 2019-05-28T21:18:13Z

Oh wow, the failure has nothing to do with this PR, it just accidentally got triggered:

rust/src/libsyntax/source_map.rs

Lines 725 to 731 in 7212685

    
           let local_begin = self.lookup_byte_offset(sp.lo()); 
        
           let local_end = self.lookup_byte_offset(sp.hi()); 
        
           debug!("find_width_of_character_at_span: local_begin=`{:?}`, local_end=`{:?}`", 
        
                  local_begin, local_end); 
        
           let start_index = local_begin.pos.to_usize(); 
        
           let end_index = local_end.pos.to_usize();

That code is missing a check that local_begin and local_end actually are in the same SourceFile, like this (from a different function):

rust/src/libsyntax/source_map.rs

Lines 514 to 517 in 7212685

    
           let local_begin = self.lookup_byte_offset(sp.lo()); 
        
           let local_end = self.lookup_byte_offset(sp.hi()); 
        
           if local_begin.sf.start_pos != local_end.sf.start_pos {

Macros are involved, somehow causing a span to end up with its two endpoints in different files. That might otherwise result in ICEs, if not for them being at the exact same byte offset (within their respective files) which the algorithm doesn't account for.
cc @davidtwco @petrochenkov

…sn't start and end in the same file.

eddyb · 2019-05-28T21:30:09Z

@TheSirC I've pushed two commits - if you need to rebase, please pull first (and don't squash the syntax: ... commit away, since it's a separate bugfix).

@bors r+

bors · 2019-05-28T21:30:11Z

📌 Commit 95013e6 has been approved by eddyb

Changes the type `mir::Mir` into `mir::Body` Fixes part 1 of rust-lang#60229 (previously attempted in rust-lang#60242). I stumbled upon the issue and it seems that the previous attempt at solving it was not merged. This is a second try more up-to-date. The commit should have changed comments as well. At the time of writting, it passes the tidy and check tool.

@ghost

Rollup of 9 pull requests Successful merges: - #60742 (Allow const parameters in array sizes to be unified) - #60756 (Add better tests for hidden lifetimes in impl trait) - #60928 (Changes the type `mir::Mir` into `mir::Body`) - #61024 (tests: Centralize proc macros commonly used for testing) - #61157 (BufReader: In Seek impl, remove extra discard_buffer call) - #61195 (Special-case `.llvm` in mangler) - #61202 (Print PermissionExt::mode() in octal in Documentation Examples) - #61259 (Mailmap fixes) - #61273 (mention that MaybeUninit is a bit like Option) Failed merges: r? @ghost

rustup rust-lang/rust#60928 changelog: none

Changes: ```` Rustup to rust-lang#61203 rustup rust-lang#60928 rustup rust-lang#61164 (which is included in rust-lang#61274) ````

@oli-obk

submodules: update clippy from fb33fad to d2f5122 Changes: ```` Rustup to #61203 rustup #60928 rustup #61164 (which is included in #61274) ```` Fixes #61287 r? @oli-obk

Changes: ```` Rustup to rust-lang/rust#61203 rustup rust-lang/rust#60928 rustup rust-lang/rust#61164 (which is included in rust-lang/rust#61274) ````

rust-highfive assigned eddyb May 17, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 17, 2019

eddyb reviewed May 22, 2019

View reviewed changes

eddyb suggested changes May 22, 2019

View reviewed changes

TheSirC force-pushed the fix/60229 branch from 82b658a to c26eaaa Compare May 22, 2019 17:20

eddyb approved these changes May 23, 2019

View reviewed changes

TheSirC force-pushed the fix/60229 branch from c26eaaa to 4bcd5fb Compare May 24, 2019 08:58

TheSirC force-pushed the fix/60229 branch from 4bcd5fb to 6d14e73 Compare May 24, 2019 09:32

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 24, 2019

Centril mentioned this pull request May 25, 2019

Rollup of 5 pull requests #61153

Closed

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 May 25, 2019

TheSirC force-pushed the fix/60229 branch from 6d14e73 to d5f7181 Compare May 25, 2019 09:49

This comment has been minimized.

Sign in to view

eddyb reviewed May 28, 2019

View reviewed changes

src/librustc_mir/transform/promote_consts.rs Outdated Show resolved Hide resolved

eddyb reviewed May 28, 2019

View reviewed changes

src/librustc/ty/steal.rs Outdated Show resolved Hide resolved

eddyb added 2 commits May 29, 2019 00:26

rustc: rename Mir to mir::Body in comments and to MIR in error strings.

3e5beb2

syntax: bail out of find_width_of_character_at_span if the span doe…

95013e6

…sn't start and end in the same file.

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 May 28, 2019

Centril mentioned this pull request May 28, 2019

Rollup of 9 pull requests #61296

Merged

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request May 28, 2019

rustup rust-lang/rust#60928

22e77df

bors merged commit 95013e6 into rust-lang:master May 29, 2019

bors added a commit to rust-lang/rust-clippy that referenced this pull request May 29, 2019

Auto merge of #4153 - matthiaskrgr:rustup_5, r=flip1995

f721683

rustup rust-lang/rust#60928 changelog: none

bors added a commit to rust-lang/rust-clippy that referenced this pull request May 29, 2019

Auto merge of #4153 - matthiaskrgr:rustup_5, r=flip1995

9586d73

rustup rust-lang/rust#60928 changelog: none

bors added a commit to rust-lang/rust-clippy that referenced this pull request May 29, 2019

Auto merge of #4153 - matthiaskrgr:rustup_5, r=flip1995

6361040

rustup rust-lang/rust#60928 changelog: none

bors added a commit to rust-lang/rust-clippy that referenced this pull request May 29, 2019

Auto merge of #4153 - matthiaskrgr:rustup_5, r=flip1995

fd6161a

rustup rust-lang/rust#60928 changelog: none

bors added a commit to rust-lang/rust-clippy that referenced this pull request May 29, 2019

Auto merge of #4153 - matthiaskrgr:rustup_5, r=flip1995

04e5f7e

rustup rust-lang/rust#60928 changelog: none

bors added a commit to rust-lang/rust-clippy that referenced this pull request May 29, 2019

Auto merge of #4153 - matthiaskrgr:rustup_5, r=flip1995

a49511c

rustup rust-lang/rust#60928 changelog: none

bors added a commit to rust-lang/rust-clippy that referenced this pull request May 29, 2019

Auto merge of #4153 - matthiaskrgr:rustup_5, r=flip1995

018fa30

rustup rust-lang/rust#60928 changelog: none

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 30, 2019

submodules: update clippy from fb33fad to d2f5122

9817f19

Changes: ```` Rustup to rust-lang#61203 rustup rust-lang#60928 rustup rust-lang#61164 (which is included in rust-lang#61274) ````

This was referenced Jun 3, 2019

Renames mir::Mir to mir::Body #60242

Closed

Rename mir::Mir to mir::Body, by analogy with hir::Body. #60229

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Changes the type `mir::Mir` into `mir::Body` #60928

Changes the type `mir::Mir` into `mir::Body` #60928

TheSirC commented May 17, 2019

rust-highfive commented May 17, 2019

eddyb May 22, 2019

TheSirC May 22, 2019

eddyb May 22, 2019

TheSirC May 22, 2019

eddyb left a comment

TheSirC commented May 22, 2019

eddyb commented May 23, 2019

TheSirC commented May 24, 2019

rust-highfive commented May 24, 2019

TheSirC commented May 24, 2019

eddyb commented May 24, 2019

bors commented May 24, 2019

bors commented May 25, 2019

TheSirC commented May 25, 2019

TheSirC commented May 25, 2019

eddyb commented May 25, 2019

bors commented May 25, 2019

This comment has been minimized.

eddyb May 28, 2019

eddyb commented May 28, 2019

eddyb commented May 28, 2019

bors commented May 28, 2019

		@@ -1,4 +1,4 @@
		use rustc::mir::{BasicBlock, Location, Mir};
		use rustc::mir::{BasicBlock, Location, Body};

Changes the type mir::Mir into mir::Body #60928

Changes the type mir::Mir into mir::Body #60928

Conversation

TheSirC commented May 17, 2019

rust-highfive commented May 17, 2019

eddyb May 22, 2019

Choose a reason for hiding this comment

TheSirC May 22, 2019

Choose a reason for hiding this comment

eddyb May 22, 2019

Choose a reason for hiding this comment

TheSirC May 22, 2019

Choose a reason for hiding this comment

eddyb left a comment

Choose a reason for hiding this comment

TheSirC commented May 22, 2019

eddyb commented May 23, 2019

TheSirC commented May 24, 2019

rust-highfive commented May 24, 2019

TheSirC commented May 24, 2019

eddyb commented May 24, 2019

bors commented May 24, 2019

bors commented May 25, 2019

TheSirC commented May 25, 2019

TheSirC commented May 25, 2019

eddyb commented May 25, 2019

bors commented May 25, 2019

This comment has been minimized.

eddyb May 28, 2019

Choose a reason for hiding this comment

eddyb commented May 28, 2019

eddyb commented May 28, 2019

bors commented May 28, 2019

Changes the type `mir::Mir` into `mir::Body` #60928

Changes the type `mir::Mir` into `mir::Body` #60928