[embedded] In -assert-config Debug, print errors in assertions, preconditions, fatalErrors

Author: kubamracek

lib/SIL/IR/Linker.cpp

@@ -102,7 +102,7 @@ void SILLinkerVisitor::maybeAddFunctionToWorklist(SILFunction *F,
                                                   bool setToSerializable) {
   SILLinkage linkage = F->getLinkage();
   assert((!setToSerializable || F->hasValidLinkageForFragileRef() ||
-         hasSharedVisibility(linkage)) &&
+         hasSharedVisibility(linkage) || Mod.getOptions().EmbeddedSwift) &&
          "called function has wrong linkage for serialized function");
 
   if (!F->isExternalDeclaration()) {
@@ -422,7 +422,7 @@ void SILLinkerVisitor::visitMetatypeInst(MetatypeInst *MI) {
 }
 
 void SILLinkerVisitor::visitGlobalAddrInst(GlobalAddrInst *GAI) {
-  if (!Mod.getASTContext().LangOpts.hasFeature(Feature::Embedded))
+  if (!Mod.getOptions().EmbeddedSwift)
     return;
 
   SILGlobalVariable *G = GAI->getReferencedGlobal();
@@ -448,7 +448,7 @@ void SILLinkerVisitor::process() {
       Fn->setSerialized(IsSerialized_t::IsNotSerialized);
     }
 
-    if (Fn->getModule().getASTContext().LangOpts.hasFeature(Feature::Embedded) &&
+    if (Fn->getModule().getOptions().EmbeddedSwift &&
         Fn->getModule().getASTContext().LangOpts.DebuggerSupport) {
       // LLDB requires that functions with bodies are not external.
       Fn->setLinkage(stripExternalFromLinkage(Fn->getLinkage()));

lib/SIL/IR/Linker.h

@@ -146,8 +146,7 @@ class SILLinkerVisitor : public SILInstructionVisitor<SILLinkerVisitor, void> {
   /// Is the current mode link all? Link all implies we should try and link
   /// everything, not just transparent/shared functions.
   bool isLinkAll() const {
-    return Mode == LinkingMode::LinkAll ||
-           Mod.getASTContext().LangOpts.hasFeature(Feature::Embedded);
+    return Mode == LinkingMode::LinkAll || Mod.getOptions().EmbeddedSwift;
   }
 
   void linkInVTable(ClassDecl *D);

stdlib/public/core/AssertCommon.swift

@@ -110,6 +110,9 @@ internal func _assertionFailure(
       }
     }
   }
+#else
+  _embeddedReportFatalErrorInFile(prefix: prefix, message: message, file: file,
+    line: line)
 #endif
   Builtin.int_trap()
 }
@@ -183,6 +186,8 @@ internal func _assertionFailure(
   _ prefix: StaticString, _ message: StaticString,
   flags: UInt32
 ) -> Never {
+  _embeddedReportFatalError(prefix: prefix, message: message)
+
   Builtin.int_trap()
 }
 #endif

stdlib/public/core/EmbeddedRuntime.swift

@@ -338,3 +338,19 @@ func arc4random_buf(buf: UnsafeMutableRawPointer, nbytes: Int)
 public func swift_stdlib_random(_ buf: UnsafeMutableRawPointer, _ nbytes: Int) {
   arc4random_buf(buf: buf, nbytes: nbytes)
 }
+
+@usableFromInline
+func _embeddedReportFatalError(prefix: StaticString, message: StaticString) {
+  print(prefix, terminator: "")
+  if message.utf8CodeUnitCount > 0 { print(": ", terminator: "") }
+  print(message)
+}
+
+@usableFromInline
+func _embeddedReportFatalErrorInFile(prefix: StaticString, message: StaticString, file: StaticString, line: UInt) {
+  print(file, terminator: ":")
+  print(line, terminator: ": ")
+  print(prefix, terminator: "")
+  if message.utf8CodeUnitCount > 0 { print(": ", terminator: "") }
+  print(message)
+}