remove --offline so new deps can be added to CI build; cast isize/usize to i64/u64

Author: Ellen Arteca

miri

@@ -139,9 +139,8 @@ find_sysroot() {
 case "$COMMAND" in
 install)
     # "--locked" to respect the Cargo.lock file if it exists,
-    # "--offline" to avoid querying the registry (for yanked packages).
-    $CARGO install $CARGO_EXTRA_FLAGS --path "$MIRIDIR" --force --locked --offline "$@"
-    $CARGO install $CARGO_EXTRA_FLAGS --path "$MIRIDIR"/cargo-miri --force --locked --offline "$@"
+    $CARGO install $CARGO_EXTRA_FLAGS --path "$MIRIDIR" --force --locked "$@"
+    $CARGO install $CARGO_EXTRA_FLAGS --path "$MIRIDIR"/cargo-miri --force --locked "$@"
     ;;
 check)
     # Check, and let caller control flags.

src/c_ffi_support.rs

@@ -123,13 +123,9 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                     }
                     hir::PrimTy::Int(IntTy::Isize) => {
                         let x = call::<isize>(ptr, libffi_args.as_slice());
-                        if isize::BITS == 64 {
-                            this.write_int(x as i64, dest)?;
-                        } else if usize::BITS == 32 {
-                            this.write_int(x as i32, dest)?;
-                        } else {
-                            panic!("machine isize should be 32 or 64 bits");
-                        }
+                        // `isize` doesn't `impl Into<i128>`, so convert manually.
+                        // Convert to `i64` since this covers both 32- and 64-bit machines.
+                        this.write_int(i64::try_from(x).unwrap(), dest)?;
                         return Ok(());
                     }
                     // uints
@@ -155,13 +151,9 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                     }
                     hir::PrimTy::Uint(UintTy::Usize) => {
                         let x = call::<usize>(ptr, libffi_args.as_slice());
-                        if usize::BITS == 64 {
-                            this.write_int(x as u64, dest)?;
-                        } else if usize::BITS == 32 {
-                            this.write_int(x as u32, dest)?;
-                        } else {
-                            panic!("machine usize should be 32 or 64 bits");
-                        }
+                        // `usize` doesn't `impl Into<i128>`, so convert manually.
+                        // Convert to `u64` since this covers both 32- and 64-bit machines.
+                        this.write_int(u64::try_from(x).unwrap(), dest)?;
                         return Ok(());
                     }
                     _ => {}