Remove forked rust dependency (#19)

This PR removes the forked rust dependency by implementing the following
two functions directly in smir_pretty (instead of in a forked rust
compiler):

-   visited_tys
-   visited_alloc_ids

This is done by extending the functionality of `LinkNameCollector` to
also collect `Ty` and `AllocId` mappings and renaming the combined
collector to `InternedValueCollector`.

EDIT: When running the panic example on rustc master, there is some
weirdness where a static item called:

`alloc::alloc::__rust_no_alloc_shim_is_unstable`

is generated which has no body. This static item appears to be
referenced from several different allocations (can be seen by chasing
pointers in allocations provenance table). If this funny static item is
findable on other machines, we should document this issue. It may well
be that this is an empty type that is never used at runtime, but I
haven't gone in to check this yet.

---------

Co-authored-by: Jost Berthold <jost.berthold@gmail.com>
Co-authored-by: dkcumming <daniel.cumming@runtimeverification.com>
Co-authored-by: Daniel Cumming <124537596+dkcumming@users.noreply.github.com>

Author: 3 people

Makefile

@@ -16,20 +16,27 @@ RUST_LIB_DIR=${RUST_INSTALL_DIR}/lib
 RUST_DEP_DIR=${RUST_BUILD_DIR}/stage1-rustc/${RUST_ARCH}/release/deps
 TARGET_DEP_DIR=${CURDIR}/target/${TARGET}/deps
 TEMP_DIR=${RUST_DIR}/temp
-RUST_REPO=https://github.com/runtimeverification/rust
-RUST_BRANCH=smir_serde_derive_intern_scripts
-TOOLCHAIN_NAME=smir_serde_derive_intern_scripts
+#############################################
+# depend on the rust compiler
+RUST_REPO=https://github.com/rust-lang/rust
+# tip of the `beta` branch on 2025-01-14
+RUST_BRANCH=beta
+RUST_COMMIT=fe9b975
+#############################################
+TOOLCHAIN_NAME=smir_pretty
 RELEASE_FLAG=
 ifeq (${TARGET}, release)
 RELEASE_FLAG=--release
 endif
 
+default: build
+
 build_all: rust_build rust_set_toolchain build
 
 setup: rust_clone
 
 update: ${RUST_SRC}
-	cd "${RUST_SRC}"; git fetch origin; git reset --hard origin/${RUST_BRANCH}
+	cd "${RUST_SRC}"; git fetch origin; git checkout ${RUST_COMMIT}
 
 build:
 	cargo build ${RELEASE_FLAG}
@@ -53,7 +60,9 @@ prebuild_clean: ${RUST_SRC}
 
 # NOTE: a deeper clone depth is needed for the build process
 rust_clone:
-	git clone --depth 70 --single-branch --branch "${RUST_BRANCH}" "${RUST_REPO}" "${RUST_SRC}"
+	git clone --depth 70 --single-branch --branch "${RUST_BRANCH}" "${RUST_REPO}" "${RUST_SRC}" && \
+	cd "${RUST_SRC}" && \
+	git checkout ${RUST_COMMIT}
 
 
 # rust_build for linking against custom rustc is involved

src/driver.rs

@@ -24,7 +24,7 @@ extern crate rustc_smir;
 extern crate rustc_session;
 use rustc_middle::ty::TyCtxt;
 use rustc_driver::Compilation;
-use rustc_interface::{interface::Compiler, Queries};
+use rustc_interface::interface::Compiler;
 use rustc_smir::rustc_internal;
 
 struct StableMirCallbacks {
@@ -35,16 +35,10 @@ impl rustc_driver::Callbacks for StableMirCallbacks {
     fn after_analysis<'tcx>(
         &mut self,
         _compiler: &Compiler,
-        queries: &'tcx Queries<'tcx>,
+        tcx: TyCtxt<'tcx>,
     ) -> Compilation {
 
-        let _q = queries
-            .global_ctxt()
-            .unwrap()
-            .get_mut()
-            .enter(|tcx| {
-                let _ = rustc_internal::run(tcx, || (self.callback_fn)(tcx));
-            });
+        let _ = rustc_internal::run(tcx, || (self.callback_fn)(tcx));
 
         Compilation::Continue
     }