[PATCH] D120365: [WebAssembly] Fixed AsmPrinter not emitting .functype for intrinsics

[Wouter van Oortmerssen via Phabricator via llvm-commits]

aardappel updated this revision to Diff 410665.
aardappel added a comment.

Reduced test, and added asm roundtrip test


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D120365/new/

https://reviews.llvm.org/D120365

Files:
  llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
  llvm/test/MC/WebAssembly/extern-functype-intrinsic.ll


Index: llvm/test/MC/WebAssembly/extern-functype-intrinsic.ll
===================================================================
--- /dev/null
+++ llvm/test/MC/WebAssembly/extern-functype-intrinsic.ll
@@ -0,0 +1,38 @@
+; RUN: llc %s -o - | FileCheck %s
+; RUN: llc %s -o - | llvm-mc -triple=wasm32-unknown-unknown | FileCheck %s
+
+; ModuleID = 'test.c'
+source_filename = "test.c"
+target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
+target triple = "wasm32-unknown-wasi"
+
+; Function Attrs: nounwind
+define hidden i32 @d() local_unnamed_addr #0 {
+entry:
+  %call = call i32 bitcast (i32 (...)* @g to i32 ()*)() #3
+  %cmp6 = icmp sgt i32 %call, 0
+  br i1 %cmp6, label %for.body.preheader, label %for.end
+
+for.body.preheader:                               ; preds = %entry
+  %0 = shl nuw i32 %call, 2
+  call void @llvm.memset.p0i8.i32(i8* nonnull align 4 inttoptr (i32 4 to i8*), i8 0, i32 %0, i1 false)
+  br label %for.end
+
+for.end:                                          ; preds = %for.body.preheader, %entry
+  ret i32 undef
+}
+
+declare i32 @g(...) local_unnamed_addr #1
+
+; Function Attrs: argmemonly nofree nounwind willreturn writeonly
+declare void @llvm.memset.p0i8.i32(i8* nocapture writeonly, i8, i32, i1 immarg) #2
+
+attributes #0 = { nounwind "frame-pointer"="none" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="generic" }
+attributes #1 = { "frame-pointer"="none" "no-prototype" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="generic" }
+attributes #2 = { argmemonly nofree nounwind willreturn writeonly }
+attributes #3 = { nounwind }
+
+; CHECK:         .functype       memset (i32, i32, i32) -> (i32)
+; CHECK:         .functype       g () -> (i32)
+; CHECK:         call    g
+; CHECK:         call    memset
Index: llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
===================================================================
--- llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
+++ llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
@@ -302,7 +302,12 @@
   // not be found here.
   MachineModuleInfoWasm &MMIW = MMI->getObjFileInfo<MachineModuleInfoWasm>();
   for (const auto &Name : MMIW.MachineSymbolsUsed) {
-    getOrCreateWasmSymbol(Name.getKey());
+    auto *WasmSym = cast<MCSymbolWasm>(getOrCreateWasmSymbol(Name.getKey()));
+    if (WasmSym->isFunction()) {
+      // TODO(wvo): is there any case where this overlaps with the call to
+      // emitFunctionType in the loop below?
+      getTargetStreamer()->emitFunctionType(WasmSym);
+    }
   }
 
   for (auto &It : OutContext.getSymbols()) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D120365.410665.patch
Type: text/x-patch
Size: 2676 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220223/1c25e4fe/attachment.bin>