Merge pull request #74898 from eeckstein/fix-error-message-6.0

[6.0] Deserializer: flush the diag engine to see a function type mismatch error

Author: eeckstein

lib/Serialization/DeserializeSIL.cpp

@@ -430,10 +430,11 @@ SILFunction *SILDeserializer::getFuncForReference(StringRef name,
         if (auto *decl = dyn_cast_or_null<AbstractFunctionDecl>(dc->getAsDecl()))
           fnName = decl->getNameStr();
       }
-      fn->getModule().getASTContext().Diags.diagnose(
-        fn->getLocation().getSourceLoc(),
-        diag::deserialize_function_type_mismatch,
-        fnName, fnType.getASTType(), type.getASTType());
+      auto &diags = fn->getModule().getASTContext().Diags;
+      diags.diagnose(fn->getLocation().getSourceLoc(),
+                     diag::deserialize_function_type_mismatch,
+                     fnName, fnType.getASTType(), type.getASTType());
+      diags.flushConsumers();
       exit(1);
     }
     return fn;

test/embedded/functype-mismatch.swift

@@ -0,0 +1,13 @@
+// RUN: not %target-swift-frontend %s -enable-experimental-feature Embedded -wmo -emit-sil -o /dev/null 2>&1 | %FileCheck %s
+
+// REQUIRES: optimized_stdlib
+// REQUIRES: OS=macosx
+
+// This is a mismatch compared to what's in the embedded stdlib
+@_silgen_name("putchar")
+// CHECK: type mismatch of function 'putchar'
+public func putchar(_ value: CInt, _ x: Int) -> CInt {
+  return 0
+}
+
+print("hello")