Join GitHub today
GitHub is home to over 31 million developers working together to host and review code, manage projects, and build software together.
Sign upRebase to the llvm-project monorepo #57675
Conversation
rust-highfive
assigned
alexcrichton
Jan 16, 2019
This comment has been minimized.
This comment has been minimized.
|
rust-highfive
added
the
S-waiting-on-review
label
Jan 16, 2019
cuviper
referenced this pull request
Jan 16, 2019
Closed
[DO NOT MERGE] Apply Rust patches on release/8.x #1
This comment has been minimized.
This comment has been minimized.
|
@bors: r+ |
This comment has been minimized.
This comment has been minimized.
|
|
bors
added
S-waiting-on-bors
and removed
S-waiting-on-review
labels
Jan 16, 2019
nikic
reviewed
Jan 16, 2019
| @@ -47,6 +47,7 @@ pub mod libcoretest; | |||
| fn filter_dirs(path: &Path) -> bool { | |||
| let skip = [ | |||
| "src/llvm", | |||
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
cuviper
Jan 16, 2019
Author
Member
I left the LLVM-related src/tools/* here too. My thought was to keep ignoring those paths in tidy, in case a developer still has those obsolete submodules in place. (For instance, they may be moving between branches and don't want to remove them.)
This comment has been minimized.
This comment has been minimized.
|
@bors p=3 |
This comment has been minimized.
This comment has been minimized.
|
@bors: r+ I've added two more commits from rust-lang/llvm-project#2 |
This comment has been minimized.
This comment has been minimized.
|
|
alexcrichton
referenced this pull request
Jan 17, 2019
Merged
[WIP] Encode WebAssembly specific locations in DBG_VALUEs and DW_AT_frame_base #2
This comment has been minimized.
This comment has been minimized.
bors
added a commit
that referenced
this pull request
Jan 18, 2019
This comment has been minimized.
This comment has been minimized.
|
|
bors
added
S-waiting-on-review
and removed
S-waiting-on-bors
labels
Jan 18, 2019
This comment has been minimized.
This comment has been minimized.
|
Not really clear to me why it fails to compile core from the AppVeyor log, but possibly this is because compiler-rt in https://github.com/rust-lang-nursery/compiler-builtins hasn't been synced with the LLVM version we're updating to here. |
This comment has been minimized.
This comment has been minimized.
|
Hmm, I wonder if we could get compiler-builtins to just use the monorepo's compiler-rt, so they're always in sync. It would mean the Anyway, I do have a machine that I can boot into Windows, so I'll try to reproduce this... |
This comment has been minimized.
This comment has been minimized.
|
I think it's probably also fine to just add an llvm-project in the compiler-builtins repository, we can deal with publishing far less to crates.io and git deps hopefully won't be too too common. |
This comment has been minimized.
This comment has been minimized.
|
Oh, I forgot that compiler-builtins is now pulled from crates.io -- then yeah, it could control what it publishes from the monorepo. Anyway, my first build as-is with MSVC cl was fine. I'm trying again with clang-cl as appveyor does. |
This comment has been minimized.
This comment has been minimized.
|
Well, I can't reproduce the issue with clang-cl either. If anyone else has a ready Windows system to try it, I would appreciate some debugging help. |
kennytm
added
S-waiting-on-author
and removed
S-waiting-on-review
labels
Jan 20, 2019
This comment has been minimized.
This comment has been minimized.
|
Did you remember to |
This comment has been minimized.
This comment has been minimized.
|
Yes, I just double-checked config.toml to make sure I had Another thing I noticed is appveyor's use of |
This comment has been minimized.
This comment has been minimized.
|
@cuviper Another thing to check would be whether you have |
This comment has been minimized.
This comment has been minimized.
|
OK, I matched more config settings, and this time got a dialog about a failed assertion: (If there's a way to get windows/appveyor to show that on the console instead, we should...) That assertion is: class MDNode : public Metadata {
//...
const MDOperand &getOperand(unsigned I) const {
assert(I < NumOperands && "Out of range");
return op_begin()[I];
}I'll try to get that in a debugger... |
This comment has been minimized.
This comment has been minimized.
|
I have already tried building Rust against a newer LLVM version but that fails for me due to LLVM commit eaa73537bb48767af73b2aa8b03eef00d1f6f7c8:
Are there already patches to update Edit: Ah, it's actually part of this PR ;). Will give it a try. |
This comment has been minimized.
This comment has been minimized.
|
The job Click to expand the log.
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 |
This comment has been minimized.
This comment has been minimized.
|
Likely cause: https://reviews.llvm.org/D56645 |
This comment has been minimized.
This comment has been minimized.
|
Based on the date, the new intrinsic names would be in LLVM 7 but not LLVM 6. Is wasm supposed to be compatible with system LLVM at all? |
This comment has been minimized.
This comment has been minimized.
|
I believe that usage came from an old version of dlmalloc, so I published a new version with that commit and this is hopefully good to go! @bors: r+ |
This comment has been minimized.
This comment has been minimized.
|
|
bors
added
S-waiting-on-bors
and removed
S-waiting-on-review
labels
Jan 25, 2019
mati865
reviewed
Jan 25, 2019
| @@ -1813,7 +1813,7 @@ name = "rand_chacha" | |||
| version = "0.1.0" | |||
| source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| dependencies = [ | |||
| "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | |||
| "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", | |||
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
cuviper
Jan 25, 2019
Author
Member
Both of those rand_core versions are already in the dependency tree, and rand_chacha requires rand_core >= 0.2, < 0.4. I guess it's just a quirk of how cargo resolved this when making the other change. But rand_core 0.2.2 just re-exports from 0.3 anyway, so it doesn't really matter.
cuviper
and others
added some commits
Jan 16, 2019
cuviper
force-pushed the
cuviper:llvm-monorepo
branch
from
fe93b3d
to
059ed4f
Jan 26, 2019
This comment has been minimized.
This comment has been minimized.
|
I rebased to avoid Cargo.lock conflicts. @bors r=alexcrichton |
This comment has been minimized.
This comment has been minimized.
|
|
This comment has been minimized.
This comment has been minimized.
bors
added a commit
that referenced
this pull request
Jan 26, 2019
This comment has been minimized.
This comment has been minimized.
|
|
bors
merged commit 059ed4f
into
rust-lang:master
Jan 26, 2019
1 check passed
This comment has been minimized.
This comment has been minimized.
|
|
This was referenced Jan 27, 2019
This comment has been minimized.
This comment has been minimized.
|
Perf results are in: https://perf.rust-lang.org/compare.html?start=37d51aa8f3bca674a50eb7c6204deed6fb4dff80&end=9df043b543bb9bc3e50bc243811c58d52a3aefea&stat=instructions:u Looks like mostly minor improvements for simple crates / incremental. Only one regression in kekkac-opt that might be worth taking a glance at. |

cuviper commentedJan 16, 2019
The new git submodule src/llvm-project is a monorepo replacing src/llvm
and src/tools/{clang,lld,lldb}. This also serves as a rebase for these
projects to the new 8.x branch from trunk.
The src/llvm-emscripten fork is unchanged for now.
r? @alexcrichton