Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustc: Start implementing compat with LLVM 9 #59710

Merged
merged 1 commit into from
Apr 6, 2019

Conversation

alexcrichton
Copy link
Member

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.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 4, 2019
@rust-highfive
Copy link
Collaborator

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:21578cd6:start=1554409316947974927,finish=1554409317826173340,duration=878198413
$ 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:23:24]    Compiling memmap v0.6.2
[00:23:30] error: failed to run custom build command for `rustc_llvm v0.0.0 (/checkout/src/librustc_llvm)`
[00:23:30] process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-codegen/release/build/rustc_llvm-ce6334ff013f1c9d/build-script-build` (exit code: 101)
[00:23:30] --- stdout
[00:23:30] cargo:rerun-if-env-changed=REAL_LIBRARY_PATH_VAR
[00:23:30] cargo:rerun-if-env-changed=REAL_LIBRARY_PATH
[00:23:30] cargo:rerun-if-changed=/usr/lib/llvm-6.0/bin/llvm-config
[00:23:30] cargo:rerun-if-env-changed=LLVM_CONFIG
[00:23:30] cargo:rustc-cfg=llvm_component="aarch64"
[00:23:30] cargo:rustc-cfg=llvm_component="amdgpu"
[00:23:30] cargo:rustc-cfg=llvm_component="arm"
[00:23:30] cargo:rustc-cfg=llvm_component="asmparser"
[00:23:30] cargo:rustc-cfg=llvm_component="bitreader"
[00:23:30] cargo:rustc-cfg=llvm_component="bitwriter"
[00:23:30] cargo:rustc-cfg=llvm_component="hexagon"
[00:23:30] cargo:rustc-cfg=llvm_component="instrumentation"
[00:23:30] cargo:rustc-cfg=llvm_component="interpreter"
[00:23:30] cargo:rustc-cfg=llvm_component="ipo"
[00:23:30] cargo:rustc-cfg=llvm_component="linker"
[00:23:30] cargo:rustc-cfg=llvm_component="lto"
[00:23:30] cargo:rustc-cfg=llvm_component="mcjit"
[00:23:30] cargo:rustc-cfg=llvm_component="mips"
[00:23:30] cargo:rustc-cfg=llvm_component="msp430"
[00:23:30] cargo:rustc-cfg=llvm_component="nvptx"
[00:23:30] cargo:rustc-cfg=llvm_component="powerpc"
[00:23:30] cargo:rustc-cfg=llvm_component="sparc"
[00:23:30] cargo:rustc-cfg=llvm_component="systemz"
[00:23:30] cargo:rustc-cfg=llvm_component="x86"
[00:23:30] cargo:rerun-if-changed-env=LLVM_RUSTLLVM
[00:23:30] cargo:rerun-if-changed=../rustllvm/ArchiveWrapper.cpp
[00:23:30] cargo:rerun-if-changed=../rustllvm/RustWrapper.cpp
[00:23:30] cargo:rerun-if-changed=../rustllvm/README
[00:23:30] cargo:rerun-if-changed=../rustllvm/Linker.cpp
[00:23:30] cargo:rerun-if-changed=../rustllvm/.editorconfig
[00:23:30] cargo:rerun-if-changed=../rustllvm/PassWrapper.cpp
[00:23:30] cargo:rerun-if-changed=../rustllvm/rustllvm.h
[00:23:30] OPT_LEVEL = Some("2")
[00:23:30] HOST = Some("x86_64-unknown-linux-gnu")
[00:23:30] HOST = Some("x86_64-unknown-linux-gnu")
[00:23:30] CXX_x86_64-unknown-linux-gnu = Some("sccache c++")
[00:23:30] CXXFLAGS_x86_64-unknown-linux-gnu = Some("-ffunction-sections -fdata-sections -fPIC -m64")
[00:23:30] DEBUG = Some("false")
[00:23:30] running: "sccache" "c++" "-O2" "-ffunction-sections" "-fdata-sections" "-fPIC" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-m64" "-I/usr/lib/llvm-6.0/include" "-std=c++0x" "-fuse-ld=gold" "-Wl,--no-keep-files-mapped" "-Wl,--no-map-whole-files" "-fPIC" "-fvisibility-inlines-hidden" "-Werror=date-time" "-std=c++11" "-Wall" "-W" "-Wno-unused-parameter" "-Wwrite-strings" "-Wcast-qual" "-Wno-missing-field-initializers" "-pedantic" "-Wno-long-long" "-Wno-maybe-uninitialized" "-Wdelete-non-virtual-dtor" "-Wno-comment" "-ffunction-sections" "-fdata-sections" "-O2" "-DNDEBUG" "-fno-exceptions" "-D_GNU_SOURCE" "-D__STDC_CONSTANT_MACROS" "-D__STDC_FORMAT_MACROS" "-D__STDC_LIMIT_MACROS" "-DLLVM_COMPONENT_AARCH64" "-DLLVM_COMPONENT_AMDGPU" "-DLLVM_COMPONENT_ARM" "-DLLVM_COMPONENT_ASMPARSER" "-DLLVM_COMPONENT_BITREADER" "-DLLVM_COMPONENT_BITWRITER" "-DLLVM_COMPONENT_HEXAGON" "-DLLVM_COMPONENT_INSTRUMENTATION" "-DLLVM_COMPONENT_INTERPRETER" "-DLLVM_COMPONENT_IPO" "-DLLVM_COMPONENT_LINKER" "-DLLVM_COMPONENT_LTO" "-DLLVM_COMPONENT_MCJIT" "-DLLVM_COMPONENT_MIPS" "-DLLVM_COMPONENT_MSP430" "-DLLVM_COMPONENT_NVPTX" "-DLLVM_COMPONENT_POWERPC" "-DLLVM_COMPONENT_SPARC" "-DLLVM_COMPONENT_SYSTEMZ" "-DLLVM_COMPONENT_X86" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-codegen/x86_64-unknown-linux-gnu/release/build/rustc_llvm-7835821f8c6f3f86/out/../rustllvm/PassWrapper.o" "-c" "../rustllvm/PassWrapper.cpp"
[00:23:30] exit code: 0
[00:23:30] running: "sccache" "c++" "-O2" "-ffunction-sections" "-fdata-sections" "-fPIC" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-m64" "-I/usr/lib/llvm-6.0/include" "-std=c++0x" "-fuse-ld=gold" "-Wl,--no-keep-files-mapped" "-Wl,--no-map-whole-files" "-fPIC" "-fvisibility-inlines-hidden" "-Werror=date-time" "-std=c++11" "-Wall" "-W" "-Wno-unused-parameter" "-Wwrite-strings" "-Wcast-qual" "-Wno-missing-field-initializers" "-pedantic" "-Wno-long-long" "-Wno-maybe-uninitialized" "-Wdelete-non-virtual-dtor" "-Wno-comment" "-ffunction-sections" "-fdata-sections" "-O2" "-DNDEBUG" "-fno-exceptions" "-D_GNU_SOURCE" "-D__STDC_CONSTANT_MACROS" "-D__STDC_FORMAT_MACROS" "-D__STDC_LIMIT_MACROS" "-DLLVM_COMPONENT_AARCH64" "-DLLVM_COMPONENT_AMDGPU" "-DLLVM_COMPONENT_ARM" "-DLLVM_COMPONENT_ASMPARSER" "-DLLVM_COMPONENT_BITREADER" "-DLLVM_COMPONENT_BITWRITER" "-DLLVM_COMPONENT_HEXAGON" "-DLLVM_COMPONENT_INSTRUMENTATION" "-DLLVM_COMPONENT_INTERPRETER" "-DLLVM_COMPONENT_IPO" "-DLLVM_COMPONENT_LINKER" "-DLLVM_COMPONENT_LTO" "-DLLVM_COMPONENT_MCJIT" "-DLLVM_COMPONENT_MIPS" "-DLLVM_COMPONENT_MSP430" "-DLLVM_COMPONENT_NVPTX" "-DLLVM_COMPONENT_POWERPC" "-DLLVM_COMPONENT_SPARC" "-DLLVM_COMPONENT_SYSTEMZ" "-DLLVM_COMPONENT_X86" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-codegen/x86_64-unknown-linux-gnu/release/build/rustc_llvm-7835821f8c6f3f86/out/../rustllvm/RustWrapper.o" "-c" "../rustllvm/RustWrapper.cpp"
[00:23:30] cargo:warning=../rustllvm/RustWrapper.cpp: In function 'LLVMOpaqueValue* LLVMRustGetOrInsertFunction(LLVMModuleRef, const char*, LLVMTypeRef)':
[00:23:30] cargo:warning=../rustllvm/RustWrapper.cpp:120:78: error: request for member 'getCallee' in 'llvm::unwrap(M)->llvm::Module::getOrInsertFunction(llvm::StringRef(Name), llvm::unwrap<llvm::FunctionType>(FunctionTy))', which is of pointer type 'llvm::Constant*' (maybe you meant to use '->' ?)
[00:23:30] cargo:warning=       unwrap(M)->getOrInsertFunction(Name, unwrap<FunctionType>(FunctionTy)).getCallee());
[00:23:30] cargo:warning=                                                                              ^
[00:23:30] 
[00:23:30] --- stderr
[00:23:30] thread 'main' panicked at '
[00:23:30] 
[00:23:30] 
[00:23:30] Internal error occurred: Command "sccache" "c++" "-O2" "-ffunction-sections" "-fdata-sections" "-fPIC" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-m64" "-I/usr/lib/llvm-6.0/include" "-std=c++0x" "-fuse-ld=gold" "-Wl,--no-keep-files-mapped" "-Wl,--no-map-whole-files" "-fPIC" "-fvisibility-inlines-hidden" "-Werror=date-time" "-std=c++11" "-Wall" "-W" "-Wno-unused-parameter" "-Wwrite-strings" "-Wcast-qual" "-Wno-missing-field-initializers" "-pedantic" "-Wno-long-long" "-Wno-maybe-uninitialized" "-Wdelete-non-virtual-dtor" "-Wno-comment" "-ffunction-sections" "-fdata-sections" "-O2" "-DNDEBUG" "-fno-exceptions" "-D_GNU_SOURCE" "-D__STDC_CONSTANT_MACROS" "-D__STDC_FORMAT_MACROS" "-D__STDC_LIMIT_MACROS" "-DLLVM_COMPONENT_AARCH64" "-DLLVM_COMPONENT_AMDGPU" "-DLLVM_COMPONENT_ARM" "-DLLVM_COMPONENT_ASMPARSER" "-DLLVM_COMPONENT_BITREADER" "-DLLVM_COMPONENT_BITWRITER" "-DLLVM_COMPONENT_HEXAGON" "-DLLVM_COMPONENT_INSTRUMENTATION" "-DLLVM_COMPONENT_INTERPRETER" "-DLLVM_COMPONENT_IPO" "-DLLVM_COMPONENT_LINKER" "-DLLVM_COMPONENT_LTO" "-DLLVM_COMPONENT_MCJIT" "-DLLVM_COMPONENT_MIPS" "-DLLVM_COMPONENT_MSP430" "-DLLVM_COMPONENT_NVPTX" "-DLLVM_COMPONENT_POWERPC" "-DLLVM_COMPONENT_SPARC" "-DLLVM_COMPONENT_SYSTEMZ" "-DLLVM_COMPONENT_X86" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-codegen/x86_64-unknown-linux-gnu/release/build/rustc_llvm-7835821f8c6f3f86/out/../rustllvm/RustWrapper.o" "-c" "../rustllvm/RustWrapper.cpp" with args "c++" did not execute successfully (status code exit code: 1).
[00:23:30] ', /cargo/registry/src/github.com-1ecc6299db9ec823/cc-1.0.28/src/lib.rs:2314:5
[00:23:30] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[00:23:30] 
[00:23:30] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/librustc_codegen_llvm/Cargo.toml" "--features" "" "--message-format" "json"
---
travis_time:end:22632a20:start=1554410740065549994,finish=1554410740069981752,duration=4431758
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0f74898c
$ 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:37f0f125
travis_time:start:37f0f125
$ 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:030af7d6
$ 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)

@rust-highfive
Copy link
Collaborator

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:1bb41fbe:start=1554416445091454046,finish=1554416446002404593,duration=910950547
$ 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
---
travis_time:start:test_codegen
Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:17:19] 
[01:17:19] running 138 tests
[01:17:22] i..iii.....iii..iiii.....i....................i..i.................i.FF..i..........ii...i..i.ii.... 100/138
[01:17:24] failures:
[01:17:24] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:516:22
[01:17:24] 
[01:17:24] ---- [codegen] codegen/mainsubprogram.rs stdout ----
[01:17:24] ---- [codegen] codegen/mainsubprogram.rs stdout ----
[01:17:24] 
[01:17:24] error: verification with 'FileCheck' failed
[01:17:24] status: exit code: 1
[01:17:24] command: "/usr/lib/llvm-6.0/bin/FileCheck" "--input-file" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/mainsubprogram/mainsubprogram.ll" "/checkout/src/test/codegen/mainsubprogram.rs"
[01:17:24] ------------------------------------------
[01:17:24] 
[01:17:24] ------------------------------------------
[01:17:24] stderr:
[01:17:24] stderr:
[01:17:24] ------------------------------------------
[01:17:24] /checkout/src/test/codegen/mainsubprogram.rs:11:11: error: expected string not found in input
[01:17:24] // CHECK: {{.*}}DISubprogram{{.*}}name: "main",{{.*}}DIFlagMainSubprogram{{.*}}
[01:17:24]           ^
[01:17:24] /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/mainsubprogram/mainsubprogram.ll:203:17: note: scanning from here
[01:17:24] define i32 @main(i32, i8**) unnamed_addr #4 {
[01:17:24]                 ^
[01:17:24] /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/mainsubprogram/mainsubprogram.ll:246:10: note: possible intended match here
[01:17:24] !17 = distinct !DISubprogram(name: "lang_start<()>", linkageName: "_ZN3std2rt10lang_start17h9f66e6bf3548ca80E", scope: !19, file: !18, line: 61, type: !21, isLocal: true, isDefinition: true, scopeLine: 61, flags: DIFlagPrototyped, isOptimized: true, unit: !14, templateParams: !32, variables: !27)
[01:17:24] 
[01:17:24] ------------------------------------------
[01:17:24] 
[01:17:24] thread '[codegen] codegen/mainsubprogram.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3425:9
[01:17:24] thread '[codegen] codegen/mainsubprogram.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3425:9
[01:17:24] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:17:24] 
[01:17:24] ---- [codegen] codegen/mainsubprogramstart.rs stdout ----
[01:17:24] 
[01:17:24] error: verification with 'FileCheck' failed
[01:17:24] status: exit code: 1
[01:17:24] command: "/usr/lib/llvm-6.0/bin/FileCheck" "--input-file" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/mainsubprogramstart/mainsubprogramstart.ll" "/checkout/src/test/codegen/mainsubprogramstart.rs"
[01:17:24] ------------------------------------------
[01:17:24] 
[01:17:24] ------------------------------------------
[01:17:24] stderr:
[01:17:24] stderr:
[01:17:24] ------------------------------------------
[01:17:24] /checkout/src/test/codegen/mainsubprogramstart.rs:10:11: error: expected string not found in input
[01:17:24] // CHECK: {{.*}}DISubprogram{{.*}}name: "start",{{.*}}DIFlagMainSubprogram{{.*}}
[01:17:24]           ^
[01:17:24] /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/mainsubprogramstart/mainsubprogramstart.ll:25:17: note: scanning from here
[01:17:24] define i32 @main(i32, i8**) unnamed_addr #2 {
[01:17:24]                 ^
[01:17:24] /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/mainsubprogramstart/mainsubprogramstart.ll:48:15: note: possible intended match here
[01:17:24] !6 = distinct !DISubprogram(name: "start", linkageName: "_ZN19mainsubprogramstart5start17h2c6e99a079046318E", scope: !7, file: !4, line: 13, type: !8, isLocal: true, isDefinition: true, scopeLine: 13, flags: DIFlagPrototyped, isOptimized: true, unit: !3, templateParams: !5, variables: !14)
[01:17:24] 
[01:17:24] ------------------------------------------
[01:17:24] 
[01:17:24] thread '[codegen] codegen/mainsubprogramstart.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3425:9
---
[01:17:24] test result: FAILED. 107 passed; 2 failed; 29 ignored; 0 measured; 0 filtered out
[01:17:24] 
[01:17:24] 
[01:17:24] 
[01:17:24] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/codegen" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "codegen" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:17:24] 
[01:17:24] 
[01:17:24] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:17:24] Build completed unsuccessfully in 0:12:11
[01:17:24] Build completed unsuccessfully in 0:12:11
[01:17:24] Makefile:48: recipe for target 'check' failed
[01:17:24] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:03071d54
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Apr  4 23:38:21 UTC 2019

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)

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.
@sanxiyn
Copy link
Member

sanxiyn commented Apr 6, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Apr 6, 2019

📌 Commit d5985bc has been approved by sanxiyn

@bors 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 6, 2019
@bors
Copy link
Contributor

bors commented Apr 6, 2019

⌛ Testing commit d5985bc with merge 8159f38...

bors added a commit that referenced this pull request Apr 6, 2019
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.
@bors
Copy link
Contributor

bors commented Apr 6, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: sanxiyn
Pushing 8159f38 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 6, 2019
@bors bors merged commit d5985bc into rust-lang:master Apr 6, 2019
@alexcrichton alexcrichton deleted the llvm-9-compat branch May 1, 2019 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants