Revert "Merge pull request #75150 from drexin/wip-130971168"

This reverts commit 8fca31e, reversing
changes made to 32af2f6.

Author: aschwaighofer

lib/IRGen/GenCall.cpp

@@ -653,7 +653,7 @@ void SignatureExpansion::expandResult(
   const TypeInfo *directResultTypeInfo;
   std::tie(ResultIRType, directResultTypeInfo) = expandDirectResult();
 
-  if (!fnConv.hasIndirectSILResults() && !fnConv.hasIndirectSILErrorResults()) {
+  if (!fnConv.hasIndirectSILErrorResults()) {
     llvm::Type *directErrorType;
     const TypeInfo *directErrorTypeInfo;
     std::tie(directErrorType, directErrorTypeInfo) = expandDirectErrorType();
@@ -2043,8 +2043,7 @@ void SignatureExpansion::expandParameters(
       auto &errorTI = IGM.getTypeInfo(errorType);
       auto &nativeError = errorTI.nativeReturnValueSchema(IGM);
 
-      if (getSILFuncConventions().hasIndirectSILResults() ||
-          getSILFuncConventions().hasIndirectSILErrorResults() ||
+      if (getSILFuncConventions().hasIndirectSILErrorResults() ||
           native.requiresIndirect() ||
           nativeError.shouldReturnTypedErrorIndirectly()) {
         ParamIRTypes.push_back(IGM.getStorageType(errorType)->getPointerTo());
@@ -2607,8 +2606,7 @@ class SyncCallEmission final : public CallEmission {
           auto &errorSchema =
               IGF.IGM.getTypeInfo(silErrorTy).nativeReturnValueSchema(IGF.IGM);
 
-          if (fnConv.hasIndirectSILResults() ||
-              nativeSchema.requiresIndirect() ||
+          if (nativeSchema.requiresIndirect() ||
               errorSchema.shouldReturnTypedErrorIndirectly()) {
             // Return the error indirectly.
             auto buf = IGF.getCalleeTypedErrorResultSlot(silErrorTy);
@@ -4367,9 +4365,8 @@ bool CallEmission::mayReturnTypedErrorDirectly() const {
   SILFunctionConventions fnConv(getCallee().getOrigFunctionType(),
                                 IGF.getSILModule());
   bool mayReturnErrorDirectly = false;
-  if (!convertDirectToIndirectReturn && !fnConv.hasIndirectSILResults() &&
-      !fnConv.hasIndirectSILErrorResults() && fnConv.funcTy->hasErrorResult() &&
-      fnConv.isTypedError()) {
+  if (!convertDirectToIndirectReturn && !fnConv.hasIndirectSILErrorResults() &&
+      fnConv.funcTy->hasErrorResult() && fnConv.isTypedError()) {
     auto errorType =
         fnConv.getSILErrorType(IGF.IGM.getMaximalTypeExpansionContext());
     auto &errorSchema =

lib/IRGen/IRGenSIL.cpp

@@ -2183,8 +2183,7 @@ static void emitEntryPointArgumentsNativeCC(IRGenSILFunction &IGF,
       auto &errorTI = cast<FixedTypeInfo>(IGF.getTypeInfo(inContextErrorType));
       auto &native = resultTI.nativeReturnValueSchema(IGF.IGM);
       auto &nativeError = errorTI.nativeReturnValueSchema(IGF.IGM);
-      if (funcTy->isAsync() || fnConv.hasIndirectSILResults() ||
-          native.requiresIndirect() ||
+      if (funcTy->isAsync() || native.requiresIndirect() ||
           nativeError.shouldReturnTypedErrorIndirectly()) {
         IGF.setCallerTypedErrorResultSlot(
             Address(emission->getCallerTypedErrorResultArgument(),
@@ -3926,8 +3925,7 @@ void IRGenSILFunction::visitFullApplySite(FullApplySite site) {
       auto &resultSchema = resultTI.nativeReturnValueSchema(IGM);
       auto &errorSchema = errorTI.nativeReturnValueSchema(IGM);
 
-      if (isAsync() || substConv.hasIndirectSILResults() ||
-          substConv.hasIndirectSILErrorResults() ||
+      if (isAsync() || substConv.hasIndirectSILErrorResults() ||
           resultSchema.requiresIndirect() ||
           errorSchema.shouldReturnTypedErrorIndirectly()) {
         Explosion errorValue;
@@ -4394,7 +4392,7 @@ static void emitReturnInst(IRGenSILFunction &IGF,
            funcLang == SILFunctionLanguage::C && "Need to handle all cases");
     SILType errorType;
     if (fnType->hasErrorResult() && conv.isTypedError() &&
-        !conv.hasIndirectSILResults() && !conv.hasIndirectSILErrorResults()) {
+        !conv.hasIndirectSILErrorResults()) {
       errorType =
           conv.getSILErrorType(IGF.IGM.getMaximalTypeExpansionContext());
     }
@@ -4449,8 +4447,7 @@ void IRGenSILFunction::visitThrowInst(swift::ThrowInst *i) {
         auto &errorSchema = errorTI.nativeReturnValueSchema(IGM);
 
         Builder.CreateStore(flag, getCallerErrorResultSlot());
-        if (conv.hasIndirectSILResults() || conv.hasIndirectSILErrorResults() ||
-            resultSchema.requiresIndirect() ||
+        if (resultSchema.requiresIndirect() ||
             errorSchema.shouldReturnTypedErrorIndirectly()) {
           errorTI.initialize(*this, errorResult, getCallerTypedErrorResultSlot(),
                              false);

test/IRGen/typed_throws.swift

@@ -144,13 +144,3 @@ func directErrorMergePtrAndInt(x: Bool, y: AnyObject) throws(SmallError) -> (Any
 
   return try directErrorMergePtrAndInt(x: !x, y: y)
 }
-
-// This used to crash at compile time, because it was trying to use a direct
-// error return in combination with an indirect result, which is illegal.
-func genericThrows<T>(x: Bool, y: T) throws(SmallError) -> T {
-  guard x else {
-    throw SmallError(x: 1)
-  }
-
-  return y
-}