Finished moving backend-agnostic code to rustc_codegen_ssa

4 files changed, 20 insertions, 20 deletions

diff --git a/src/librustc_codegen_ssa/base.rs b/src/librustc_codegen_ssa/base.rs
index de85bb54397..71ad46ac9b3 100644
--- a/src/librustc_codegen_ssa/base.rs
+++ b/src/librustc_codegen_ssa/base.rs
@@ -463,7 +463,7 @@ pub fn codegen_instance<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
 
 /// Create the `main` function which will initialize the rust runtime and call
 /// users main function.
-fn maybe_create_entry_wrapper<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
+pub fn maybe_create_entry_wrapper<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
     cx: &'a Bx::CodegenCx
 ) {
     let (main_def_id, span) = match *cx.sess().entry_fn.borrow() {
diff --git a/src/librustc_codegen_ssa/debuginfo.rs b/src/librustc_codegen_ssa/debuginfo.rs
index 2891b1c22fe..0fc61422bb3 100644
--- a/src/librustc_codegen_ssa/debuginfo.rs
+++ b/src/librustc_codegen_ssa/debuginfo.rs
@@ -57,8 +57,8 @@ pub fn start_emitting_source_locations<D>(dbg_context: &FunctionDebugContext<D>)
 }
 
 pub struct FunctionDebugContextData<D> {
-    fn_metadata: D,
-    source_locations_enabled: Cell<bool>,
+    pub fn_metadata: D,
+    pub source_locations_enabled: Cell<bool>,
     pub defining_crate: CrateNum,
 }
 
diff --git a/src/librustc_codegen_ssa/interfaces/debuginfo.rs b/src/librustc_codegen_ssa/interfaces/debuginfo.rs
index 784d69e93bf..aefc59609af 100644
--- a/src/librustc_codegen_ssa/interfaces/debuginfo.rs
+++ b/src/librustc_codegen_ssa/interfaces/debuginfo.rs
@@ -48,7 +48,7 @@ pub trait DebugInfoMethods<'tcx>: Backend<'tcx> {
         defining_crate: CrateNum,
     ) -> Self::DIScope;
     fn debuginfo_finalize(&self);
-    fn debuginfo_upvar_decls_ops_sequence(&self, byte_offset_of_var_in_env: u64) -> &[i64];
+    fn debuginfo_upvar_decls_ops_sequence(&self, byte_offset_of_var_in_env: u64) -> [i64; 4];
 }
 
 pub trait DebugInfoBuilderMethods<'tcx>: HasCodegen<'tcx> {
diff --git a/src/librustc_codegen_ssa/lib.rs b/src/librustc_codegen_ssa/lib.rs
index 9c4dfb0825a..818c96f9e91 100644
--- a/src/librustc_codegen_ssa/lib.rs
+++ b/src/librustc_codegen_ssa/lib.rs
@@ -141,22 +141,22 @@ bitflags! {
 }
 
 /// Misc info we load from metadata to persist beyond the tcx
-struct CrateInfo {
-    panic_runtime: Option<CrateNum>,
-    compiler_builtins: Option<CrateNum>,
-    profiler_runtime: Option<CrateNum>,
-    sanitizer_runtime: Option<CrateNum>,
-    is_no_builtins: FxHashSet<CrateNum>,
-    native_libraries: FxHashMap<CrateNum, Lrc<Vec<NativeLibrary>>>,
-    crate_name: FxHashMap<CrateNum, String>,
-    used_libraries: Lrc<Vec<NativeLibrary>>,
-    link_args: Lrc<Vec<String>>,
-    used_crate_source: FxHashMap<CrateNum, Lrc<CrateSource>>,
-    used_crates_static: Vec<(CrateNum, LibSource)>,
-    used_crates_dynamic: Vec<(CrateNum, LibSource)>,
-    wasm_imports: FxHashMap<String, String>,
-    lang_item_to_crate: FxHashMap<LangItem, CrateNum>,
-    missing_lang_items: FxHashMap<CrateNum, Vec<LangItem>>,
+pub struct CrateInfo {
+    pub panic_runtime: Option<CrateNum>,
+    pub compiler_builtins: Option<CrateNum>,
+    pub profiler_runtime: Option<CrateNum>,
+    pub sanitizer_runtime: Option<CrateNum>,
+    pub is_no_builtins: FxHashSet<CrateNum>,
+    pub native_libraries: FxHashMap<CrateNum, Lrc<Vec<NativeLibrary>>>,
+    pub crate_name: FxHashMap<CrateNum, String>,
+    pub used_libraries: Lrc<Vec<NativeLibrary>>,
+    pub link_args: Lrc<Vec<String>>,
+    pub used_crate_source: FxHashMap<CrateNum, Lrc<CrateSource>>,
+    pub used_crates_static: Vec<(CrateNum, LibSource)>,
+    pub used_crates_dynamic: Vec<(CrateNum, LibSource)>,
+    pub wasm_imports: FxHashMap<String, String>,
+    pub lang_item_to_crate: FxHashMap<LangItem, CrateNum>,
+    pub missing_lang_items: FxHashMap<CrateNum, Vec<LangItem>>,
 }
 
 __build_diagnostic_array! { librustc_codegen_ssa, DIAGNOSTICS }