From eb4fc2d4fefe2638f986aeb0fa2368ff88c584d5 Mon Sep 17 00:00:00 2001 From: maik Date: Tue, 7 Jan 2020 15:33:33 +0100 Subject: [PATCH] Export scalar statics in wasm --- src/librustc_codegen_ssa/back/symbol_export.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/librustc_codegen_ssa/back/symbol_export.rs b/src/librustc_codegen_ssa/back/symbol_export.rs index edd0fa504270..9cf0f0a801e1 100644 --- a/src/librustc_codegen_ssa/back/symbol_export.rs +++ b/src/librustc_codegen_ssa/back/symbol_export.rs @@ -349,7 +349,12 @@ fn symbol_export_level(tcx: TyCtxt<'_>, sym_def_id: DefId) -> SymbolExportLevel if let Some(Node::Item(&hir::Item { kind: hir::ItemKind::Static(..), .. })) = tcx.hir().get_if_local(sym_def_id) { - return SymbolExportLevel::Rust; + let export_level = if tcx.type_of(sym_def_id).is_scalar() { + SymbolExportLevel::C + } else { + SymbolExportLevel::Rust + }; + return export_level; } }