From 79c054f6b8b0f7989366f56c84ee30f92e3e6b1f Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Thu, 13 Sep 2018 17:13:10 +0000
Subject: [PATCH] [WebAssembly] Fix signature of `main` in FixFunctionBitcasts

Also, add a check to ensure that when main has the expected signature
we do not create a wrapper.

Differential Revision: https://reviews.llvm.org/D51562

llvm-svn: 342157
---
 .../WebAssembly/WebAssemblyFixFunctionBitcasts.cpp       |  6 ++++--
 .../CodeGen/WebAssembly/{main.ll => main-no-args.ll}     |  0
 llvm/test/CodeGen/WebAssembly/main-with-args.ll          | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 rename llvm/test/CodeGen/WebAssembly/{main.ll => main-no-args.ll} (100%)
 create mode 100644 llvm/test/CodeGen/WebAssembly/main-with-args.ll

diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp
index 179dcc5..0644f12 100644
--- a/llvm/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp
+++ b/llvm/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp
@@ -244,11 +244,13 @@ bool FixFunctionBitcasts::runOnModule(Module &M) {
     if (!TemporaryWorkarounds && !F.isDeclaration() && F.getName() == "main") {
       Main = &F;
       LLVMContext &C = M.getContext();
-      Type *MainArgTys[] = {PointerType::get(Type::getInt8PtrTy(C), 0),
-                            Type::getInt32Ty(C)};
+      Type *MainArgTys[] = {Type::getInt32Ty(C),
+                            PointerType::get(Type::getInt8PtrTy(C), 0)};
       FunctionType *MainTy = FunctionType::get(Type::getInt32Ty(C), MainArgTys,
                                                /*isVarArg=*/false);
       if (F.getFunctionType() != MainTy) {
+        LLVM_DEBUG(dbgs() << "Found `main` function with incorrect type: "
+                          << *F.getFunctionType() << "\n");
         Value *Args[] = {UndefValue::get(MainArgTys[0]),
                          UndefValue::get(MainArgTys[1])};
         Value *Casted =
diff --git a/llvm/test/CodeGen/WebAssembly/main.ll b/llvm/test/CodeGen/WebAssembly/main-no-args.ll
similarity index 100%
rename from llvm/test/CodeGen/WebAssembly/main.ll
rename to llvm/test/CodeGen/WebAssembly/main-no-args.ll
diff --git a/llvm/test/CodeGen/WebAssembly/main-with-args.ll b/llvm/test/CodeGen/WebAssembly/main-with-args.ll
new file mode 100644
index 0000000..aa08540
--- /dev/null
+++ b/llvm/test/CodeGen/WebAssembly/main-with-args.ll
@@ -0,0 +1,16 @@
+; RUN: llc < %s -asm-verbose=false -wasm-temporary-workarounds=false | FileCheck %s
+
+; Test that main function with expected signature is not wrapped
+
+target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
+target triple = "wasm32-unknown-unknown"
+
+define i32 @main(i32 %a, i8** %b) {
+  ret i32 0
+}
+
+; CHECK-LABEL: main:
+; CHECK-NEXT: .param i32, i32
+; CHECK-NEXT: .result i32
+
+; CHECK-NOT: __original_main:
-- 
2.7.4