Move back::link and debuginfo::type_names to cg ssa #59564

bjorn3 · 2019-03-30T14:51:36Z

rust-highfive · 2019-03-30T15:07:11Z

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:07facccc:start=1553957578027087069,finish=1553957580173954438,duration=2146867369
$ 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
Setting environment variables from .travis.yml
---

[00:03:41] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:03:42] tidy error: /checkout/src/librustc_codegen_ssa/back/link.rs:149: line longer than 100 chars
[00:03:42] tidy error: /checkout/src/librustc_codegen_ssa/back/archive.rs:36: line longer than 100 chars
[00:03:43] some tidy checks failed
[00:03:43] 
[00:03:43] 
[00:03:43] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:03:43] 
[00:03:43] 
[00:03:43] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:03:43] Build completed unsuccessfully in 0:00:45
[00:03:43] Build completed unsuccessfully in 0:00:45
[00:03:43] make: *** [tidy] Error 1
[00:03:43] Makefile:67: recipe for target 'tidy' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:001ae938
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sat Mar 30 14:56:53 UTC 2019
---
travis_time:end:1dd25da8:start=1553957814597962515,finish=1553957814602865996,duration=4903481
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:20805a53
$ 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:0044f3a0
travis_time:start:0044f3a0
$ 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:0b253a36
$ 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)

bors · 2019-04-01T22:05:23Z

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

bjorn3 · 2019-04-02T16:16:46Z

Rebased

bors · 2019-04-02T19:41:45Z

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

bjorn3 · 2019-04-05T18:04:36Z

Rebased

bors · 2019-04-06T01:43:47Z

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

bjorn3 · 2019-04-06T09:51:41Z

Rebased (again)

eddyb · 2019-04-06T13:58:30Z

src/librustc_codegen_ssa/lib.rs

 }

+pub const METADATA_FILENAME: &str = "rust.metadata.bin";
 pub const RLIB_BYTECODE_EXTENSION: &str = "bc.z";


This is a problem, because bc is LLVM-specific.

But feel free to file an issue and leave it for later.

What is the convention on those kind of issues? File it right now and add a comment here referencing it?

eddyb · 2019-04-06T14:01:34Z

src/librustc_codegen_ssa/back/link.rs

@@ -1,21 +1,40 @@
 /// For all the linkers we support, and information they might
 /// need out of the shared crate context before we get rid of it.


cc @alexcrichton @michaelwoerister I feel like this module would be better suited for another crate, say rustc_codegen_link or rustc_link(er), what do you think?

Who should depend on who? CrateInfo and CodegenResults are both needed by rustc_codegen_ssa and the linker code.

eddyb · 2019-04-06T14:04:30Z

r=me with or without comments addressed

eddyb · 2019-04-09T22:27:22Z

@bors r+

bors · 2019-04-09T22:27:24Z

📌 Commit c922dec has been approved by eddyb

bors · 2019-04-09T22:27:24Z

🌲 The tree is currently closed for pull requests below priority 15, this pull request will be tested once the tree is reopened

@eddyb

Move back::link and debuginfo::type_names to cg ssa r? @eddyb

bors · 2019-04-12T08:58:58Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout move_link_to_cg_ssa (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self move_link_to_cg_ssa --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/librustc_codegen_ssa/debuginfo/type_names.rs
Auto-merging src/librustc_codegen_ssa/debuginfo/mod.rs
Auto-merging src/librustc_codegen_llvm/debuginfo/mod.rs
Auto-merging src/librustc_codegen_llvm/back/write.rs
Removing src/librustc_codegen_llvm/back/link.rs
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

bors · 2019-04-20T05:25:49Z

📌 Commit 5adcd39c6bf0b07d3d8f564e4b488599ca94e592 has been approved by eddyb

bors · 2019-04-20T05:25:55Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout move_link_to_cg_ssa (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self move_link_to_cg_ssa --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/librustc_codegen_ssa/lib.rs
Auto-merging src/librustc_codegen_ssa/debuginfo/type_names.rs
Auto-merging src/librustc_codegen_ssa/debuginfo/mod.rs
Auto-merging src/librustc_codegen_llvm/lib.rs
Removing src/librustc_codegen_llvm/back/link.rs
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

Xanewok · 2019-04-20T06:30:01Z

@bjorn3 maybe this needs another rebase?

...
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock

@bors delegate+

I experienced something similar in #60053 (comment).
@pietroalbini is it because how homu manages branches specifically or it uses some non-default merge strategy? (and why is Cargo.lock treated as a binary file?)

bors · 2019-04-20T06:30:02Z

✌️ @bjorn3 can now approve this pull request

philipc · 2019-04-20T06:40:52Z

@Xanewok See the Cargo.lock entry in .gitattributes, and rust-lang/highfive#153

Xanewok · 2019-04-20T06:46:41Z

Ah, I didn't know this was enforced on the merge level; thanks @philipc!

bjorn3 · 2019-04-20T11:24:52Z

Rebased

@bors r=eddyb

bors · 2019-04-20T11:24:53Z

📌 Commit 3af60e0 has been approved by eddyb

bors · 2019-04-20T12:18:55Z

⌛ Testing commit 3af60e0 with merge 0d17322...

@eddyb

Move back::link and debuginfo::type_names to cg ssa r? @eddyb

bors · 2019-04-20T15:06:08Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: eddyb
Pushing 0d17322 to master...

rust-highfive assigned eddyb Mar 30, 2019

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

bjorn3 mentioned this pull request Mar 30, 2019

Read and write dylib metadata rust-lang/rustc_codegen_cranelift#435

Merged

jonas-schievink added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 1, 2019

bjorn3 force-pushed the move_link_to_cg_ssa branch from 769f194 to 9d056a9 Compare April 2, 2019 16:16

bjorn3 force-pushed the move_link_to_cg_ssa branch from 9d056a9 to bac45b0 Compare April 5, 2019 18:00

bjorn3 force-pushed the move_link_to_cg_ssa branch from bac45b0 to c922dec Compare April 6, 2019 09:49

eddyb reviewed Apr 6, 2019

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 Apr 9, 2019

bjorn3 mentioned this pull request Apr 11, 2019

Problems with parsing rust-ar generated archives after ranlib mdsteele/rust-ar#10

Closed

cramertj added a commit to cramertj/rust that referenced this pull request Apr 11, 2019

Rollup merge of rust-lang#59564 - bjorn3:move_link_to_cg_ssa, r=eddyb

ef896aa

Move back::link and debuginfo::type_names to cg ssa r? @eddyb

cramertj mentioned this pull request Apr 11, 2019

Rollup of 16 pull requests #59885

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 Apr 12, 2019

bjorn3 force-pushed the move_link_to_cg_ssa branch from c922dec to d418a25 Compare April 12, 2019 18:47

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 Apr 20, 2019

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 Apr 20, 2019

bjorn3 added 8 commits April 20, 2019 13:21

Move some function from cg_llvm/back/link.rs to cg_ssa/back/link.rs

8a88379

Move some filename constants to cg_ssa

892c88b

Make link functions generic over archive builder

d8bce01

Remove get_reloc_model and target_cpu dependency from most of link.rs

de4ee55

Move almost all of cg_llvm/back/link.rs to cg_ssa

93a3b41

Remove cg_llvm/back/link.rs

dd4566f

Move cg_llvm/debuginfo/type_names.rs to cg_ssa

d4e7b08

Tidy

3af60e0

bjorn3 force-pushed the move_link_to_cg_ssa branch from 5adcd39 to 3af60e0 Compare April 20, 2019 11:23

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 Apr 20, 2019

bors added a commit that referenced this pull request Apr 20, 2019

Auto merge of #59564 - bjorn3:move_link_to_cg_ssa, r=eddyb

0d17322

Move back::link and debuginfo::type_names to cg ssa r? @eddyb

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 20, 2019

bors merged commit 3af60e0 into rust-lang:master Apr 20, 2019

bjorn3 deleted the move_link_to_cg_ssa branch April 20, 2019 15:11

bjorn3 mentioned this pull request Apr 20, 2019

Use more rustc_codegen_ssa::back::link for linking rust-lang/rustc_codegen_cranelift#491

Merged

		@@ -1,21 +1,40 @@
		/// For all the linkers we support, and information they might
		/// need out of the shared crate context before we get rid of it.

Move back::link and debuginfo::type_names to cg ssa #59564

Move back::link and debuginfo::type_names to cg ssa #59564

Uh oh!

Conversation

bjorn3 commented Mar 30, 2019

Uh oh!

rust-highfive commented Mar 30, 2019

Uh oh!

bors commented Apr 1, 2019

Uh oh!

bjorn3 commented Apr 2, 2019

Uh oh!

bors commented Apr 2, 2019

Uh oh!

bjorn3 commented Apr 5, 2019

Uh oh!

bors commented Apr 6, 2019

Uh oh!

bjorn3 commented Apr 6, 2019

Uh oh!

eddyb Apr 6, 2019

Choose a reason for hiding this comment

Uh oh!

eddyb Apr 6, 2019

Choose a reason for hiding this comment

Uh oh!

bjorn3 Apr 6, 2019

Choose a reason for hiding this comment

Uh oh!

eddyb Apr 6, 2019

Choose a reason for hiding this comment

Uh oh!

bjorn3 Apr 6, 2019

Choose a reason for hiding this comment

Uh oh!

eddyb commented Apr 6, 2019

Uh oh!

eddyb commented Apr 9, 2019

Uh oh!

bors commented Apr 9, 2019

Uh oh!

bors commented Apr 9, 2019

Uh oh!

bors commented Apr 12, 2019

Uh oh!

bors commented Apr 20, 2019

Uh oh!

bors commented Apr 20, 2019

Uh oh!

Xanewok commented Apr 20, 2019

Uh oh!

bors commented Apr 20, 2019

Uh oh!

philipc commented Apr 20, 2019

Uh oh!

Xanewok commented Apr 20, 2019

Uh oh!

bjorn3 commented Apr 20, 2019

Uh oh!

bors commented Apr 20, 2019

Uh oh!

bors commented Apr 20, 2019

Uh oh!

bors commented Apr 20, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants