From d03612c2d992a1551bdf6df4aa7f7b09ada5da05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Cabrera?= Date: Mon, 13 Mar 2023 13:50:53 -0400 Subject: [PATCH] cranelift-codegen(x64): Expose `CallInfo` (#6005) This commit exposes the `CallInfo` struct, needed by Winch to emit function calls. --- cranelift/codegen/src/isa/x64/inst/mod.rs | 2 +- cranelift/codegen/src/isa/x64/mod.rs | 2 +- crates/cranelift/src/lib.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cranelift/codegen/src/isa/x64/inst/mod.rs b/cranelift/codegen/src/isa/x64/inst/mod.rs index 396f9fd4a2..c1c71690da 100644 --- a/cranelift/codegen/src/isa/x64/inst/mod.rs +++ b/cranelift/codegen/src/isa/x64/inst/mod.rs @@ -30,7 +30,7 @@ use args::*; // `Inst` is defined inside ISLE as `MInst`. We publicly re-export it here. pub use super::lower::isle::generated_code::MInst as Inst; -// Out-of-line data for calls, to keep the size of `Inst` downn. +/// Out-of-line data for calls, to keep the size of `Inst` down. #[derive(Clone, Debug)] pub struct CallInfo { /// Register uses of this call. diff --git a/cranelift/codegen/src/isa/x64/mod.rs b/cranelift/codegen/src/isa/x64/mod.rs index 79f79c7e2d..dd84f4395a 100644 --- a/cranelift/codegen/src/isa/x64/mod.rs +++ b/cranelift/codegen/src/isa/x64/mod.rs @@ -1,6 +1,6 @@ //! X86_64-bit Instruction Set Architecture. -pub use self::inst::{args, EmitInfo, EmitState, Inst}; +pub use self::inst::{args, CallInfo, EmitInfo, EmitState, Inst}; use super::{OwnedTargetIsa, TargetIsa}; use crate::dominator_tree::DominatorTree; diff --git a/crates/cranelift/src/lib.rs b/crates/cranelift/src/lib.rs index d9c9d8c956..aed73950ed 100644 --- a/crates/cranelift/src/lib.rs +++ b/crates/cranelift/src/lib.rs @@ -135,7 +135,7 @@ fn indirect_signature(isa: &dyn TargetIsa, wasm: &WasmFuncType) -> ir::Signature return sig; } -/// Returns the cranelift fucntion signature of the function specified. +/// Returns the cranelift function signature of the function specified. /// /// Note that this will determine the calling convention for the function, and /// namely includes an optimization where functions never exported from a module