[clang] 78747bd - [clang][WebAssembly] Loosen restriction on `main` symbol mangling

[Sam Clegg via cfe-commits]

Author: Sam Clegg
Date: 2022-06-15T13:56:05-07:00
New Revision: 78747bd39af807eb6b56709b9713c303704c47ad

URL: https://github.com/llvm/llvm-project/commit/78747bd39af807eb6b56709b9713c303704c47ad
DIFF: https://github.com/llvm/llvm-project/commit/78747bd39af807eb6b56709b9713c303704c47ad.diff

LOG: [clang][WebAssembly] Loosen restriction on `main` symbol mangling

Remove the `hasPrototype()` restriction so that old style K&R
declarations of main work too.

For example the following has 2 params but no prototype.

```
int main(argc, argv)
    int argc;
    char *argv[];
{
  return 0;
}
```

Also, use `getNumParams()` over `param_size()` which seems to be a more
direct way to get at the same information.

Also, add missing tests for this mangling.

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

Added: 
    clang/test/CodeGen/mangle-wasm-main-noproto.c
    clang/test/CodeGen/mangle-wasm-main-void.c
    clang/test/CodeGen/mangle-wasm-main.c

Modified: 
    clang/lib/AST/Mangle.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/AST/Mangle.cpp b/clang/lib/AST/Mangle.cpp
index c1a345390091b..7ea569c63d9e4 100644
--- a/clang/lib/AST/Mangle.cpp
+++ b/clang/lib/AST/Mangle.cpp
@@ -72,7 +72,7 @@ static CCMangling getCallingConvMangling(const ASTContext &Context,
   // can call it with the correct function signature.
   if (Triple.isWasm())
     if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(ND))
-      if (FD->isMain() && FD->hasPrototype() && FD->param_size() == 2)
+      if (FD->isMain() && FD->getNumParams() == 2)
         return CCM_WasmMainArgcArgv;
 
   if (!Triple.isOSWindows() || !Triple.isX86())

diff  --git a/clang/test/CodeGen/mangle-wasm-main-noproto.c b/clang/test/CodeGen/mangle-wasm-main-noproto.c
new file mode 100644
index 0000000000000..313ce36216e25
--- /dev/null
+++ b/clang/test/CodeGen/mangle-wasm-main-noproto.c
@@ -0,0 +1,10 @@
+// RUN: %clang_cc1 -emit-llvm %s -o - -triple=wasm32-unknown-unknown -Wno-deprecated-non-prototype | FileCheck %s
+
+int main(argc, argv)
+  int argc;
+  char* argv[];
+{
+  return 0;
+}
+// CHECK-NOT: __main_void
+// CHECK: define i32 @__main_argc_argv(i32 noundef %argc, ptr noundef %argv) #0 { 

diff  --git a/clang/test/CodeGen/mangle-wasm-main-void.c b/clang/test/CodeGen/mangle-wasm-main-void.c
new file mode 100644
index 0000000000000..f541e555ff728
--- /dev/null
+++ b/clang/test/CodeGen/mangle-wasm-main-void.c
@@ -0,0 +1,7 @@
+// RUN: %clang_cc1 -emit-llvm %s -o - -triple=wasm32-unknown-unknown | FileCheck %s
+
+int main(void) {
+  return 0;
+}
+// CHECK: @__main_void = hidden alias i32 (), ptr @main
+// CHECK: define i32 @main() #0 {

diff  --git a/clang/test/CodeGen/mangle-wasm-main.c b/clang/test/CodeGen/mangle-wasm-main.c
new file mode 100644
index 0000000000000..3a16d068666fa
--- /dev/null
+++ b/clang/test/CodeGen/mangle-wasm-main.c
@@ -0,0 +1,7 @@
+// RUN: %clang_cc1 -emit-llvm %s -o - -triple=wasm32-unknown-unknown | FileCheck %s
+
+int main(int argc, char* argv[]) {
+  return 0;
+}
+// CHECK-NOT: __main_void
+// CHECK: define i32 @__main_argc_argv(i32 noundef %argc, ptr noundef %argv) #0 {