From 2000ca4c6a3428a4cf964cfece57f5b26fb0fbe9 Mon Sep 17 00:00:00 2001 From: Andrzej Janik Date: Wed, 8 May 2024 13:19:04 +0000 Subject: [PATCH] Fix trap uinstruction codegen, don't fail build with old Rust versions --- ptx/src/emit.rs | 3 --- xtask/src/main.rs | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ptx/src/emit.rs b/ptx/src/emit.rs index 7388203b..e2d00d98 100644 --- a/ptx/src/emit.rs +++ b/ptx/src/emit.rs @@ -1337,9 +1337,6 @@ fn emit_int_trap(ctx: &mut EmitContext) -> Result<(), TranslateError> { 0, LLVM_UNNAMED, ); - // llvm.trap is not a terminator, - // LLVM might fail with an unterminated basic block if we don't insert unreachable - LLVMBuildUnreachable(builder); } Ok(()) } diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 3f1f224c..d47659f5 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -214,6 +214,7 @@ fn build_impl(is_debug: bool) -> Result { let workspace = Workspace::open(is_debug)?; let mut command = workspace.cargo_command(); command.arg("build"); + command.arg("--locked"); workspace .projects .iter()