Merge pull request swiftlang#254 from kateinoigakukun/katei/fix-thin-…

…to-thick-thunk [WASM] Skip thunk generation for throws func
kateinoigakukun · Feb 27, 2020 · e9f0bda · e9f0bda
2 parents 1f2042b + a4c2dd7
commit e9f0bda
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/lib/IRGen/IRGenSIL.cpp b/lib/IRGen/IRGenSIL.cpp
@@ -4756,10 +4756,9 @@ getLoweredFunctionPointer(IRGenSILFunction &IGF, SILValue v) {
 
 void IRGenSILFunction::visitThinToThickFunctionInst(
                                             swift::ThinToThickFunctionInst *i) {
-
-  if (IGM.TargetInfo.OutputObjectFormat == llvm::Triple::Wasm) {
-    auto fn = getLoweredFunctionPointer(*this, i->getCallee());
-    auto fnTy = i->getCallee()->getType().castTo<SILFunctionType>();
+  auto fn = getLoweredFunctionPointer(*this, i->getCallee());
+  auto fnTy = i->getCallee()->getType().castTo<SILFunctionType>();
+  if (IGM.TargetInfo.OutputObjectFormat == llvm::Triple::Wasm && !fnTy->hasErrorResult()) {
     Optional<FunctionPointer> staticFn;
     if (fn.isConstant()) staticFn = fn;
     auto thunkFn = getThinToThickForwarder(IGM, staticFn, fnTy);