replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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
This commit is contained in:
Sam Clegg 2018-09-13 17:13:10 +00:00
parent dbdd46da18
commit 79c054f6b8
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp
View File

@ -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 =

0
llvm/test/CodeGen/WebAssembly/main.ll → llvm/test/CodeGen/WebAssembly/main-no-args.ll
View File

16
llvm/test/CodeGen/WebAssembly/main-with-args.ll Normal file
View File

@ -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: