Handle pointer types, improve test

Author: hoodmane

clang/lib/CodeGen/TargetBuiltins/WebAssembly.cpp

@@ -253,13 +253,15 @@ Value *CodeGenFunction::EmitWebAssemblyBuiltinExpr(unsigned BuiltinID,
     Args.push_back(FuncRef);
 
     // Add the type information
-    auto addType = [&Args](llvm::Type *T) {
+    auto addType = [this, &Args](llvm::Type *T) {
       if (T->isVoidTy()) {
         // Do nothing
       } else if (T->isFloatingPointTy()) {
         Args.push_back(ConstantFP::get(T, 0));
       } else if (T->isIntegerTy()) {
         Args.push_back(ConstantInt::get(T, 0));
+      } else if (T->isPointerTy()) {
+        Args.push_back(ConstantPointerNull::get(llvm::PointerType::get(getLLVMContext(), T->getPointerAddressSpace())));
       } else {
         // TODO: Handle reference types. For now, we reject them in Sema.
         llvm_unreachable("Unhandled type");

clang/test/CodeGen/builtins-wasm.c

@@ -752,26 +752,23 @@ void *tp (void) {
   // WEBASSEMBLY: call {{.*}} @llvm.thread.pointer.p0()
 }
 
-
-typedef void (*funcref_t)();
-typedef int (*funcref_int_t)(int);
-typedef float (*F1)(float, double, int);
-typedef int (*F2)(float, double, int);
-typedef int (*F3)(int, int, int);
-typedef void (*F4)(int, int, int);
-typedef void (*F5)(void);
+typedef void (*Fvoid)(void);
+typedef float (*Ffloats)(float, double, int);
+typedef void (*Fpointers)(Fvoid, Ffloats, void*, int*, int***, char[5]);
 
 void use(int);
 
-void test_function_pointer_signature_void(F1 func) {
-  // WEBASSEMBLY:  %0 = tail call i32 (ptr, ...) @llvm.wasm.ref.test.func(ptr %func, float 0.000000e+00, token poison, float 0.000000e+00, double 0.000000e+00, i32 0)
+void test_function_pointer_signature_void(Fvoid func) {
+  // WEBASSEMBLY:  %0 = tail call i32 (ptr, ...) @llvm.wasm.ref.test.func(ptr %func, token poison)
+  use(__builtin_wasm_test_function_pointer_signature(func));
+}
+
+void test_function_pointer_signature_floats(Ffloats func) {
+  // WEBASSEMBLY:  tail call i32 (ptr, ...) @llvm.wasm.ref.test.func(ptr %func, float 0.000000e+00, token poison, float 0.000000e+00, double 0.000000e+00, i32 0)
+  use(__builtin_wasm_test_function_pointer_signature(func));
+}
+
+void test_function_pointer_signature_pointers(Fpointers func) {
+  // WEBASSEMBLY:  %0 = tail call i32 (ptr, ...) @llvm.wasm.ref.test.func(ptr %func, token poison, ptr null, ptr null, ptr null, ptr null, ptr null, ptr null)
   use(__builtin_wasm_test_function_pointer_signature(func));
-  // WEBASSEMBLY:  %1 = tail call i32 (ptr, ...) @llvm.wasm.ref.test.func(ptr %func, i32 0, token poison, float 0.000000e+00, double 0.000000e+00, i32 0)
-  use(__builtin_wasm_test_function_pointer_signature((F2)func));
-  // WEBASSEMBLY:  %2 = tail call i32 (ptr, ...) @llvm.wasm.ref.test.func(ptr %func, i32 0, token poison, i32 0, i32 0, i32 0)
-  use(__builtin_wasm_test_function_pointer_signature((F3)func));
-  // WEBASSEMBLY:  %3 = tail call i32 (ptr, ...) @llvm.wasm.ref.test.func(ptr %func, token poison, i32 0, i32 0, i32 0)
-  use(__builtin_wasm_test_function_pointer_signature((F4)func));
-  // WEBASSEMBLY:  %4 = tail call i32 (ptr, ...) @llvm.wasm.ref.test.func(ptr %func, token poison)
-  use(__builtin_wasm_test_function_pointer_signature((F5)func));
 }