Sync from rust b45dd71

Author: bjorn3

src/base.rs

@@ -8,8 +8,6 @@ use rustc_ast::InlineAsmOptions;
 use rustc_codegen_ssa::base::is_call_from_compiler_builtins_to_upstream_monomorphization;
 use rustc_data_structures::profiling::SelfProfilerRef;
 use rustc_index::IndexVec;
-use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
-use rustc_middle::mir::InlineAsmMacro;
 use rustc_middle::ty::TypeVisitableExt;
 use rustc_middle::ty::adjustment::PointerCoercion;
 use rustc_middle::ty::layout::{FnAbiOf,HasTypingEnv};
@@ -18,7 +16,6 @@ use rustc_middle::ty::print::with_no_trimmed_paths;
 usecrate::constant::ConstantCx;
 usecrate::debuginfo::{FunctionDebugContext,TypeDebugContext};
 usecrate::enable_verifier;
-usecrate::inline_asm::codegen_naked_asm;
 usecrate::prelude::*;
 usecrate::pretty_clif::CommentWriter;
 
@@ -37,7 +34,7 @@ pub(crate) fn codegen_fn<'tcx>(
 cached_func:Function,
 module:&mutdynModule,
 instance:Instance<'tcx>,
-) -> Option<CodegenedFunction>{
+) -> CodegenedFunction{
 debug_assert!(!instance.args.has_infer());
 
 let symbol_name = tcx.symbol_name(instance).name.to_string();
@@ -54,38 +51,6 @@ pub(crate) fn codegen_fn<'tcx>(
 String::from_utf8_lossy(&buf).into_owned()
 });
 
-if tcx.codegen_fn_attrs(instance.def_id()).flags.contains(CodegenFnAttrFlags::NAKED){
-assert_eq!(mir.basic_blocks.len(),1);
-assert!(mir.basic_blocks[START_BLOCK].statements.is_empty());
-
-match&mir.basic_blocks[START_BLOCK].terminator().kind{
-TerminatorKind::InlineAsm{
-asm_macro:InlineAsmMacro::NakedAsm,
- template,
- operands,
- options,
-line_spans: _,
-targets: _,
-unwind: _,
-} => {
-codegen_naked_asm(
- tcx,
- cx,
- module,
- instance,
- mir.basic_blocks[START_BLOCK].terminator().source_info.span,
-&symbol_name,
- template,
- operands,
-*options,
-);
-}
- _ => unreachable!(),
-}
-
-returnNone;
-}
-
 // Declare function
 let sig = get_function_sig(tcx, module.target_config().default_call_conv, instance);
 let func_id = module.declare_function(&symbol_name,Linkage::Local,&sig).unwrap();
@@ -166,7 +131,7 @@ pub(crate) fn codegen_fn<'tcx>(
 // Verify function
 verify_func(tcx,&clif_comments,&func);
 
-Some(CodegenedFunction{ symbol_name, func_id, func, clif_comments, func_debug_cx })
+CodegenedFunction{ symbol_name, func_id, func, clif_comments, func_debug_cx }
 }
 
 pub(crate)fncompile_fn(

src/driver/aot.rs

@@ -22,15 +22,18 @@ use rustc_data_structures::sync::{IntoDynSyncSend, par_map};
 use rustc_metadata::EncodedMetadata;
 use rustc_metadata::fs::copy_to_stdout;
 use rustc_middle::dep_graph::{WorkProduct,WorkProductId};
-use rustc_middle::mir::mono::{CodegenUnit,MonoItem};
+use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
+use rustc_middle::mir::mono::{
+CodegenUnit,LinkageasRLinkage,MonoItem,MonoItemData,Visibility,
+};
 use rustc_session::Session;
 use rustc_session::config::{DebugInfo,OutFileName,OutputFilenames,OutputType};
 
 usecrate::CodegenCx;
 usecrate::base::CodegenedFunction;
 usecrate::concurrency_limiter::{ConcurrencyLimiter,ConcurrencyLimiterToken};
 usecrate::debuginfo::TypeDebugContext;
-usecrate::global_asm::GlobalAsmConfig;
+usecrate::global_asm::{GlobalAsmConfig,GlobalAsmContext};
 usecrate::prelude::*;
 usecrate::unwind_module::UnwindModule;
 
@@ -530,19 +533,35 @@ fn codegen_cgu_content(
 letmut type_dbg = TypeDebugContext::default();
 super::predefine_mono_items(tcx, module,&mono_items);
 letmut codegened_functions = vec![];
-for(mono_item,_)in mono_items {
+for(mono_item,item_data)in mono_items {
 match mono_item {
-MonoItem::Fn(inst) => {
-ifletSome(codegened_function) = crate::base::codegen_fn(
+MonoItem::Fn(instance) => {
+if tcx.codegen_fn_attrs(instance.def_id()).flags.contains(CodegenFnAttrFlags::NAKED)
+{
+ rustc_codegen_ssa::mir::naked_asm::codegen_naked_asm(
+&mutGlobalAsmContext{ tcx,global_asm:&mut cx.global_asm},
+ instance,
+MonoItemData{
+linkage:RLinkage::External,
+visibility:if item_data.linkage == RLinkage::Internal{
+Visibility::Hidden
+}else{
+ item_data.visibility
+},
+ ..item_data
+},
+);
+continue;
+}
+let codegened_function = crate::base::codegen_fn(
  tcx,
 &mut cx,
 &mut type_dbg,
 Function::new(),
  module,
- inst,
-){
- codegened_functions.push(codegened_function);
-}
+ instance,
+);
+ codegened_functions.push(codegened_function);
 }
 MonoItem::Static(def_id) => {
 let data_id = crate::constant::codegen_static(tcx, module, def_id);
@@ -551,7 +570,10 @@ fn codegen_cgu_content(
 }
 }
 MonoItem::GlobalAsm(item_id) => {
-crate::global_asm::codegen_global_asm_item(tcx,&mut cx.global_asm, item_id);
+ rustc_codegen_ssa::base::codegen_global_asm(
+&mutGlobalAsmContext{ tcx,global_asm:&mut cx.global_asm},
+ item_id,
+);
 }
 }
 }

src/driver/jit.rs

@@ -126,6 +126,11 @@ fn codegen_and_compile_fn<'tcx>(
 module:&mutdynModule,
 instance:Instance<'tcx>,
 ){
+if tcx.codegen_fn_attrs(instance.def_id()).flags.contains(CodegenFnAttrFlags::NAKED){
+ tcx.dcx()
+.span_fatal(tcx.def_span(instance.def_id()),"Naked asm is not supported in JIT mode");
+}
+
  cranelift_codegen::timing::set_thread_profiler(Box::new(super::MeasuremeProfiler(
  tcx.prof.clone(),
 )));
@@ -135,16 +140,15 @@ fn codegen_and_compile_fn<'tcx>(
 crate::PrintOnPanic(|| format!("{:?} {}", instance, tcx.symbol_name(instance).name));
 
 let cached_func = std::mem::replace(&mut cached_context.func,Function::new());
-ifletSome(codegened_func) = crate::base::codegen_fn(
+let codegened_func = crate::base::codegen_fn(
  tcx,
  cx,
 &mutTypeDebugContext::default(),
  cached_func,
  module,
  instance,
-){
-crate::base::compile_fn(cx,&tcx.prof, cached_context, module, codegened_func);
-}
+);
+crate::base::compile_fn(cx,&tcx.prof, cached_context, module, codegened_func);
 });
 }