[llvm] r320121 - Revert "[WebAssemby] Support main functions with alternate signatures."

[Derek Schuff via llvm-commits]

Author: dschuff
Date: Thu Dec  7 16:39:54 2017
New Revision: 320121

URL: http://llvm.org/viewvc/llvm-project?rev=320121&view=rev
Log:
Revert "[WebAssemby] Support main functions with alternate signatures."

This reverts commit 959e37e669b0c3cfad4cb9f1f7c9261ce9f5e9ae.
That commit doesn't handle the case where main is declared rather than defined,
in particular the even-more special case where main is a prototypeless
declaration (which is of course the one actually used by musl currently).

Removed:
    llvm/trunk/test/CodeGen/WebAssembly/main.ll
Modified:
    llvm/trunk/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp

Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp?rev=320121&r1=320120&r2=320121&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp Thu Dec  7 16:39:54 2017
@@ -142,41 +142,11 @@ static Function *CreateWrapper(Function
 }
 
 bool FixFunctionBitcasts::runOnModule(Module &M) {
-  Function *Main = nullptr;
-  CallInst *CallMain = nullptr;
   SmallVector<std::pair<Use *, Function *>, 0> Uses;
   SmallPtrSet<Constant *, 2> ConstantBCs;
 
   // Collect all the places that need wrappers.
-  for (Function &F : M) {
-    FindUses(&F, F, Uses, ConstantBCs);
-
-    // If we have a "main" function, and its type isn't
-    // "int main(int argc, char *argv[])", create an artificial call with it
-    // bitcasted to that type so that we generate a wrapper for it, so that
-    // the C runtime can call it.
-    if (F.getName() == "main") {
-      Main = &F;
-      LLVMContext &C = M.getContext();
-      Type *MainArgTys[] = {
-        PointerType::get(Type::getInt8PtrTy(C), 0),
-        Type::getInt32Ty(C)
-      };
-      FunctionType *MainTy = FunctionType::get(Type::getInt32Ty(C), MainArgTys,
-                                               /*isVarArg=*/false);
-      if (F.getFunctionType() != MainTy) {
-        Value *Args[] = {
-          UndefValue::get(MainArgTys[0]),
-          UndefValue::get(MainArgTys[1])
-        };
-        Value *Casted = ConstantExpr::getBitCast(Main,
-                                                 PointerType::get(MainTy, 0));
-        CallMain = CallInst::Create(Casted, Args, "call_main");
-        Use *UseMain = &CallMain->getOperandUse(2);
-        Uses.push_back(std::make_pair(UseMain, &F));
-      }
-    }
-  }
+  for (Function &F : M) FindUses(&F, F, Uses, ConstantBCs);
 
   DenseMap<std::pair<Function *, FunctionType *>, Function *> Wrappers;
 
@@ -211,19 +181,5 @@ bool FixFunctionBitcasts::runOnModule(Mo
       U->set(Wrapper);
   }
 
-  // If we created a wrapper for main, rename the wrapper so that it's the
-  // one that gets called from startup.
-  if (CallMain) {
-    Main->setName("__original_main");
-    Function *MainWrapper =
-        cast<Function>(CallMain->getCalledValue()->stripPointerCasts());
-    MainWrapper->setName("main");
-    MainWrapper->setLinkage(Main->getLinkage());
-    MainWrapper->setVisibility(Main->getVisibility());
-    Main->setLinkage(Function::PrivateLinkage);
-    Main->setVisibility(Function::DefaultVisibility);
-    delete CallMain;
-  }
-
   return true;
 }

Removed: llvm/trunk/test/CodeGen/WebAssembly/main.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/main.ll?rev=320120&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/main.ll (original)
+++ llvm/trunk/test/CodeGen/WebAssembly/main.ll (removed)
@@ -1,18 +0,0 @@
-; RUN: llc < %s -asm-verbose=false | FileCheck %s
-
-; Test main functions with alternate signatures.
-
-target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
-
-define void @main() {
-  ret void
-}
-
-; CHECK-LABEL: .L__original_main:
-; CHECK-NEXT: end_function
-
-; CHECK-LABEL: main:
-; CHECK-NEXT: .param i32, i32
-; CHECK-NEXT: .result i32
-; CHECK:      call .L__original_main at FUNCTION