Fix trap instruction codegen, don't fail build with older Rust versio…

…ns (#229)
vosen · May 8, 2024 · f0c905d · f0c905d
1 parent 27c0e13
commit f0c905d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -214,6 +214,7 @@ fn build_impl(is_debug: bool) -> Result<Workspace, DynError> {
     let workspace = Workspace::open(is_debug)?;
     let mut command = workspace.cargo_command();
     command.arg("build");
+    command.arg("--locked");
     workspace
         .projects
         .iter()