diff options
| author | bors <bors@rust-lang.org> | 2019-04-06 13:14:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-06 13:14:23 +0000 |
| commit | 8159f389f6cc8ec3e3ea009222d6926da77371ec (patch) | |
| tree | 5307e96240a2b0d6223a5498451fbec449cacb17 /src/librustc_codegen_llvm/llvm | |
| parent | 209b0b41ac39bdeaaa0dd5d52efec4b1f8d0011f (diff) | |
| parent | d5985bc9ecbdc792d514cf531107d33f85644fdc (diff) | |
| download | rust-8159f389f6cc8ec3e3ea009222d6926da77371ec.tar.gz rust-8159f389f6cc8ec3e3ea009222d6926da77371ec.zip | |
Auto merge of #59710 - alexcrichton:llvm-9-compat, r=sanxiyn
rustc: Start implementing compat with LLVM 9 This commit doesn't actually migrate to LLVM 9, but it brings our own C++ bindings in line with LLVM 9 and able to compile against tip of tree. The changes made were: * The `MainSubprogram` flag for debuginfo moved between flag types. * Iteration of archive members was tweaked slightly and we have to construct the two iterators before constructing the returned `RustArchiveIterator` value. * The `getOrInsertFunction` binding now returns a wrapper which we use `getCallee()` on to get the value we're interested in.
Diffstat (limited to 'src/librustc_codegen_llvm/llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/llvm/ffi.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_llvm/llvm/ffi.rs b/src/librustc_codegen_llvm/llvm/ffi.rs index a0aae4df7e7..f6ee8bec16a 100644 --- a/src/librustc_codegen_llvm/llvm/ffi.rs +++ b/src/librustc_codegen_llvm/llvm/ffi.rs @@ -588,7 +588,6 @@ pub mod debuginfo { const FlagIntroducedVirtual = (1 << 18); const FlagBitField = (1 << 19); const FlagNoReturn = (1 << 20); - const FlagMainSubprogram = (1 << 21); } } @@ -603,6 +602,7 @@ pub mod debuginfo { const SPFlagLocalToUnit = (1 << 2); const SPFlagDefinition = (1 << 3); const SPFlagOptimized = (1 << 4); + const SPFlagMainSubprogram = (1 << 5); } } |
