diff --git a/cranelift/src/filetest/binemit.rs b/cranelift/src/filetest/binemit.rs index 9b18a439a1..550703f0bf 100644 --- a/cranelift/src/filetest/binemit.rs +++ b/cranelift/src/filetest/binemit.rs @@ -10,7 +10,7 @@ use cretonne::binemit; use cretonne::dbg::DisplayList; use cretonne::ir; use cretonne::ir::entities::AnyEntity; -use cretonne::regalloc::RegDiversions; +use cretonne::binemit::RegDiversions; use cton_reader::TestCommand; use filetest::subtest::{SubTest, Context, Result}; use utils::{match_directive, pretty_error}; diff --git a/lib/cretonne/src/binemit/mod.rs b/lib/cretonne/src/binemit/mod.rs index fe6262cb70..713d25bed5 100644 --- a/lib/cretonne/src/binemit/mod.rs +++ b/lib/cretonne/src/binemit/mod.rs @@ -6,11 +6,11 @@ mod relaxation; mod memorysink; +pub use regalloc::RegDiversions; pub use self::relaxation::relax_branches; pub use self::memorysink::{MemoryCodeSink, RelocSink}; use ir::{ExternalName, JumpTable, Function, Inst}; -use regalloc::RegDiversions; use std::fmt; /// Offset in bytes from the beginning of the function. diff --git a/lib/cretonne/src/lib.rs b/lib/cretonne/src/lib.rs index 9abffe0abc..f947f68621 100644 --- a/lib/cretonne/src/lib.rs +++ b/lib/cretonne/src/lib.rs @@ -25,7 +25,6 @@ pub mod ir; pub mod isa; pub mod loop_analysis; pub mod packed_option; -pub mod regalloc; pub mod result; pub mod settings; pub mod timing; @@ -40,6 +39,7 @@ mod licm; mod partition_slice; mod predicates; mod ref_slice; +mod regalloc; mod scoped_hash_map; mod simple_gvn; mod stack_layout;