diff options
| author | bors <bors@rust-lang.org> | 2022-08-16 05:13:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-16 05:13:38 +0000 |
| commit | 8556e6620e4866526b3cea767ad8c20ae877a569 (patch) | |
| tree | 13d9f9ec09bd402a73d9e1e01f5b6bef7f486544 /compiler/rustc_codegen_llvm/src/asm.rs | |
| parent | ef9810a3e2a9a16e79176cb0d3466ea82d239942 (diff) | |
| parent | 88af506e948d3a5e1aca5fe68a2d926d7cabefdd (diff) | |
| download | rust-8556e6620e4866526b3cea767ad8c20ae877a569.tar.gz rust-8556e6620e4866526b3cea767ad8c20ae877a569.zip | |
Auto merge of #100611 - matthiaskrgr:rollup-rxj10ur, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #100338 (when there are 3 or more return statements in the loop) - #100384 (Add support for generating unique profraw files by default when using `-C instrument-coverage`) - #100460 (Update the minimum external LLVM to 13) - #100567 (Add missing closing quote) - #100590 (Suggest adding an array length if possible) - #100600 (Rename Machine memory hooks to suggest when they run) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/asm.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/asm.rs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/compiler/rustc_codegen_llvm/src/asm.rs b/compiler/rustc_codegen_llvm/src/asm.rs index a53946995ee..2a6612eb86f 100644 --- a/compiler/rustc_codegen_llvm/src/asm.rs +++ b/compiler/rustc_codegen_llvm/src/asm.rs @@ -3,7 +3,6 @@ use crate::builder::Builder; use crate::common::Funclet; use crate::context::CodegenCx; use crate::llvm; -use crate::llvm_util; use crate::type_::Type; use crate::type_of::LayoutLlvmExt; use crate::value::Value; @@ -419,13 +418,6 @@ pub(crate) fn inline_asm_call<'ll>( let constraints_ok = llvm::LLVMRustInlineAsmVerify(fty, cons.as_ptr().cast(), cons.len()); debug!("constraint verification result: {:?}", constraints_ok); if constraints_ok { - if unwind && llvm_util::get_version() < (13, 0, 0) { - bx.cx.sess().span_fatal( - line_spans[0], - "unwinding from inline assembly is only supported on llvm >= 13.", - ); - } - let v = llvm::LLVMRustInlineAsm( fty, asm.as_ptr().cast(), |
