diff options
| author | bors <bors@rust-lang.org> | 2019-02-14 10:32:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-14 10:32:25 +0000 |
| commit | f47ec2ad5b6887b3d400aee49e2294bd27733d18 (patch) | |
| tree | 8888f8d17504ecad6033bd1992efeb9e04145f93 /src/rustllvm/PassWrapper.cpp | |
| parent | c67d4749a547a0c937e257ad9e0248075178ddc4 (diff) | |
| parent | 410b4456ca52b6e90259d4aaf04376d862ad36d3 (diff) | |
| download | rust-f47ec2ad5b6887b3d400aee49e2294bd27733d18.tar.gz rust-f47ec2ad5b6887b3d400aee49e2294bd27733d18.zip | |
Auto merge of #58455 - Centril:rollup, r=Centril
Rollup of 7 pull requests Successful merges: - #58309 (Add more profiler events) - #58347 (Closure bounds fixes) - #58365 (Add an option to print the status of incremental tasks / dep nodes after running them) - #58371 (Check user type annotations for range patterns.) - #58378 (rustc: Implement incremental "fat" LTO) - #58407 (specify "upper camel case" in style lint) - #58449 (Notify @topecongiro when the state of rustfmt has changed) Failed merges: r? @ghost
Diffstat (limited to 'src/rustllvm/PassWrapper.cpp')
| -rw-r--r-- | src/rustllvm/PassWrapper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp index 18d277be21a..25595e14982 100644 --- a/src/rustllvm/PassWrapper.cpp +++ b/src/rustllvm/PassWrapper.cpp @@ -1092,10 +1092,10 @@ LLVMRustThinLTOBufferLen(const LLVMRustThinLTOBuffer *Buffer) { // processing. We'll call this once per module optimized through ThinLTO, and // it'll be called concurrently on many threads. extern "C" LLVMModuleRef -LLVMRustParseBitcodeForThinLTO(LLVMContextRef Context, - const char *data, - size_t len, - const char *identifier) { +LLVMRustParseBitcodeForLTO(LLVMContextRef Context, + const char *data, + size_t len, + const char *identifier) { StringRef Data(data, len); MemoryBufferRef Buffer(Data, identifier); unwrap(Context)->enableDebugTypeODRUniquing(); |
