[WIP]

Author: bjorn3

build_system/bench.rs

@@ -73,7 +73,7 @@ pub(crate) fn benchmark(dirs: &Dirs, compiler: &Compiler) {
         bench_runs,
         Some(&clean_cmd),
         &[
-            ("cargo build", &llvm_build_cmd),
+            //("cargo build", &llvm_build_cmd),
             ("cargo-clif build", &clif_build_cmd),
             ("cargo-clif build --release", &clif_build_opt_cmd),
         ],
@@ -88,6 +88,8 @@ pub(crate) fn benchmark(dirs: &Dirs, compiler: &Compiler) {
         gha_step_summary.write_all(b"\n").unwrap();
     }
 
+    return;
+
     eprintln!("[BENCH RUN] ebobby/simple-raytracer");
 
     let bench_run_markdown = dirs.build_dir.join("bench_run.md");
@@ -103,7 +105,7 @@ pub(crate) fn benchmark(dirs: &Dirs, compiler: &Compiler) {
         bench_runs,
         None,
         &[
-            ("", raytracer_cg_llvm.to_str().unwrap()),
+            //("", raytracer_cg_llvm.to_str().unwrap()),
             ("", raytracer_cg_clif.to_str().unwrap()),
             ("", raytracer_cg_clif_opt.to_str().unwrap()),
         ],

src/abi/mod.rs

@@ -95,7 +95,8 @@ pub(crate) fn import_function<'tcx>(
 ) -> FuncId {
     let name = tcx.symbol_name(inst).name;
     let sig = get_function_sig(tcx, module.target_config().default_call_conv, inst);
-    match module.declare_function(name, Linkage::Import, &sig) {
+    match module.declare_function(name.strip_prefix("\u{1}").unwrap_or(name), Linkage::Import, &sig)
+    {
         Ok(func_id) => func_id,
         Err(ModuleError::IncompatibleDeclaration(_)) => tcx.dcx().fatal(format!(
             "attempt to declare `{name}` as function, but it was already declared as static"

src/constant.rs

@@ -286,7 +286,7 @@ fn data_id_for_static(
         };
 
         let data_id = match module.declare_data(
-            symbol_name,
+            symbol_name.strip_prefix("\u{1}").unwrap_or(symbol_name),
             linkage,
             false,
             attrs.flags.contains(CodegenFnAttrFlags::THREAD_LOCAL),
@@ -334,7 +334,7 @@ fn data_id_for_static(
     };
 
     let data_id = match module.declare_data(
-        symbol_name,
+        symbol_name.strip_prefix("\u{1}").unwrap_or(symbol_name),
         linkage,
         definition_writable,
         attrs.flags.contains(CodegenFnAttrFlags::THREAD_LOCAL),

src/lib.rs

@@ -27,7 +27,9 @@ extern crate rustc_fs_util;
 extern crate rustc_hir;
 extern crate rustc_incremental;
 extern crate rustc_index;
+extern crate rustc_macros;
 extern crate rustc_metadata;
+extern crate rustc_query_system;
 extern crate rustc_session;
 extern crate rustc_span;
 extern crate rustc_symbol_mangling;
@@ -47,6 +49,7 @@ use cranelift_codegen::isa::TargetIsa;
 use cranelift_codegen::settings::{self, Configurable};
 use rustc_codegen_ssa::traits::CodegenBackend;
 use rustc_codegen_ssa::{CodegenResults, TargetConfig};
+use rustc_macros::HashStable;
 use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
 use rustc_session::Session;
 use rustc_session::config::OutputFilenames;
@@ -125,6 +128,7 @@ impl<F: Fn() -> String> Drop for PrintOnPanic<F> {
 
 /// The codegen context holds any information shared between the codegen of individual functions
 /// inside a single codegen unit with the exception of the Cranelift [`Module`](cranelift_module::Module).
+#[derive(Copy, Clone, HashStable)]
 struct CodegenCx {
     should_write_ir: bool,
     //debug_context: Option<DebugContext>,