Rollup merge of #145275 - StackOverflowExcept1on:fix-wasm32v1-none, r=alexcrichton

fix(compiler/rustc_codegen_llvm): apply `target-cpu` attribute
Resolves#140174
r? ```@alexcrichton```
try-job: `test-various*`

Author: Zalathar

Cargo.lock

@@ -3283,7 +3283,7 @@ dependencies = [
 "regex",
 "serde_json",
 "similar",
-"wasmparser 0.219.2",
+"wasmparser 0.236.0",
 ]
 
 [[package]]

compiler/rustc_codegen_llvm/src/allocator.rs

@@ -8,11 +8,12 @@ use rustc_middle::bug;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::config::{DebugInfo,OomStrategy};
 use rustc_symbol_mangling::mangle_internal_symbol;
+use smallvec::SmallVec;
 
 usecrate::builder::SBuilder;
 usecrate::declare::declare_simple_fn;
 usecrate::llvm::{self,False,True,Type,Value};
-usecrate::{SimpleCx, attributes, debuginfo};
+usecrate::{SimpleCx, attributes, debuginfo, llvm_util};
 
 pub(crate)unsafefncodegen(
 tcx:TyCtxt<'_>,
@@ -147,6 +148,20 @@ fn create_wrapper_function(
  llvm::Visibility::from_generic(tcx.sess.default_visibility()),
  ty,
 );
+
+letmut attrs = SmallVec::<[_;2]>::new();
+
+let target_cpu = llvm_util::target_cpu(tcx.sess);
+let target_cpu_attr = llvm::CreateAttrStringValue(cx.llcx,"target-cpu", target_cpu);
+
+let tune_cpu_attr = llvm_util::tune_cpu(tcx.sess)
+.map(|tune_cpu| llvm::CreateAttrStringValue(cx.llcx,"tune-cpu", tune_cpu));
+
+ attrs.push(target_cpu_attr);
+ attrs.extend(tune_cpu_attr);
+
+ attributes::apply_to_llfn(llfn, llvm::AttributePlace::Function,&attrs);
+
 let no_return = if no_return {
 // -> ! DIFlagNoReturn
 let no_return = llvm::AttributeKind::NoReturn.create_attr(cx.llcx);

src/tools/run-make-support/Cargo.toml

@@ -17,7 +17,7 @@ object = "0.37"
 regex = "1.11"
 serde_json = "1.0"
 similar = "2.7"
-wasmparser = { version = "0.219", default-features = false, features = ["std"] }
+wasmparser = { version = "0.236", default-features = false, features = ["std", "features", "validate"] }
 # tidy-alphabetical-end
 
 # Shared with bootstrap and compiletest

tests/run-make/wasm-unexpected-features/foo.rs

@@ -0,0 +1,43 @@
+#![no_core]
+#![crate_type = "cdylib"]
+#![feature(no_core, lang_items, allocator_internals, rustc_attrs)]
+#![needs_allocator]
+#![allow(internal_features)]
+
+#[rustc_std_internal_symbol]
+unsafefn__rust_alloc(_size:usize,_align:usize) -> *mutu8{
+0as*mutu8
+}
+
+unsafeextern"Rust"{
+#[rustc_std_internal_symbol]
+fn__rust_alloc_error_handler(size:usize,align:usize) -> !;
+}
+
+#[used]
+staticmutBUF:[u8;1024] = [0;1024];
+
+#[unsafe(no_mangle)]
+extern"C"fninit(){
+unsafe{
+__rust_alloc_error_handler(0,0);
+}
+}
+
+mod minicore {
+#[lang = "pointee_sized"]
+pubtraitPointeeSized{}
+
+#[lang = "meta_sized"]
+pubtraitMetaSized:PointeeSized{}
+
+#[lang = "sized"]
+pubtraitSized:MetaSized{}
+
+#[lang = "copy"]
+pubtraitCopy{}
+implCopyforu8{}
+
+#[lang = "drop_in_place"]
+fndrop_in_place<T>(_:*mutT){}
+}

tests/run-make/wasm-unexpected-features/rmake.rs

@@ -0,0 +1,26 @@
+//@ only-wasm32-wasip1
+
+use std::path::Path;
+
+use run_make_support::{rfs, rustc, wasmparser};
+
+fnmain(){
+rustc()
+.input("foo.rs")
+.target("wasm32-wasip1")
+.target_cpu("mvp")
+.opt_level("z")
+.lto("fat")
+.linker_plugin_lto("on")
+.link_arg("--import-memory")
+.run();
+verify_features(Path::new("foo.wasm"));
+}
+
+fnverify_features(path:&Path){
+eprintln!("verify {path:?}");
+let file = rfs::read(&path);
+
+letmut validator = wasmparser::Validator::new_with_features(wasmparser::WasmFeatures::WASM1);
+ validator.validate_all(&file).unwrap();
+}