about summary refs log tree commit diff
diff options
context:
space:
mode:
authorcynecx <me@cynecx.net>2021-09-04 22:14:09 +0200
committercynecx <me@cynecx.net>2021-12-03 23:51:49 +0100
commitdd3cb0cd7513353464454d5f3da3ece03bd22f78 (patch)
tree432cbfe425b9288d553002f2a4f6d099304461de
parent5728c165fa55bafdf0204143d30568a80a4d05bb (diff)
downloadrust-dd3cb0cd7513353464454d5f3da3ece03bd22f78.tar.gz
rust-dd3cb0cd7513353464454d5f3da3ece03bd22f78.zip
cg_cranelift: check may_unwind flag instead of cleanup
-rw-r--r--src/base.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/base.rs b/src/base.rs
index 5cf6d95412b..371c71de62f 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -1,6 +1,7 @@
 //! Codegen of a single function
 
 use cranelift_codegen::binemit::{NullStackMapSink, NullTrapSink};
+use rustc_ast::InlineAsmOptions;
 use rustc_index::vec::IndexVec;
 use rustc_middle::ty::adjustment::PointerCast;
 use rustc_middle::ty::layout::FnAbiOf;
@@ -379,9 +380,9 @@ fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, '_>) {
                 options,
                 destination,
                 line_spans: _,
-                cleanup,
+                cleanup: _,
             } => {
-                if cleanup.is_some() {
+                if options.contains(InlineAsmOptions::MAY_UNWIND) {
                     fx.tcx.sess.span_fatal(
                         source_info.span,
                         "cranelift doesn't support unwinding from inline assembly.",