Merge pull request #68613 from kubamracek/embedded-exec-tests-on-x86

[embedded] Build the stdlib for x86_64 too, and run executable tests on x86_64

Author: kubamracek

lib/Frontend/CompilerInvocation.cpp

@@ -1322,6 +1322,8 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   if (Opts.hasFeature(Feature::Embedded)) {
     Opts.UnavailableDeclOptimizationMode = UnavailableDeclOptimization::Complete;
     Opts.DisableImplicitStringProcessingModuleImport = true;
+    Opts.DisableImplicitConcurrencyModuleImport = true;
+    Opts.EnableObjCInterop = false;
 
     if (FrontendOpts.EnableLibraryEvolution) {
       Diags.diagnose(SourceLoc(), diag::evolution_with_embedded);

stdlib/public/core/CMakeLists.txt

@@ -397,9 +397,10 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
   add_custom_target(embedded-stdlib ALL)
   set(EMBEDDED_STDLIB_TARGET_TRIPLES
     # arch module_name            target triple
-    "armv7 armv7-apple-none-macho armv7-apple-none-macho"
-    "arm64 arm64-apple-none-macho arm64-apple-none-macho"
-    "arm64 arm64-apple-macos      arm64-apple-macos11"
+    "armv7    armv7-apple-none-macho    armv7-apple-none-macho"
+    "arm64    arm64-apple-none-macho    arm64-apple-none-macho"
+    "x86_64   x86_64-apple-macos        x86_64-apple-macos10.13"
+    "arm64    arm64-apple-macos         arm64-apple-macos10.13"
     )
 
   set(SWIFT_ENABLE_REFLECTION OFF)

test/embedded/Inputs/print.c

@@ -0,0 +1,6 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+void print_long(long n) {
+	printf("%ld", n);
+}

test/embedded/collection.swift

@@ -1,12 +1,12 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -target arm64-apple-none-macho -Xcc -D__MACH__ -Xcc -D__arm64__ -Xcc -D__APPLE__ \
-// RUN:   -enable-experimental-feature Embedded -enforce-exclusivity=none %s -c -o %t/a.o
-// RUN: %target-clang %t/a.o -o %t/a.out
+// RUN: %target-swift-frontend -enable-experimental-feature Embedded -enforce-exclusivity=none %s -c -o %t/a.o
+// RUN: %target-clang -x c -c %S/Inputs/print.c -o %t/print.o
+// RUN: %target-clang %t/a.o %t/print.o -o %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s
 
 // REQUIRES: executable_test
 // REQUIRES: VENDOR=apple
-// REQUIRES: CPU=arm64
+// REQUIRES: OS=macosx
 
 @_silgen_name("putchar")
 func putchar(_: UInt8)
@@ -24,14 +24,12 @@ public func print(_ s: StaticString, terminator: StaticString = "\n") {
   }
 }
 
-@_silgen_name("vprintf")
-func vprintf(_: UnsafePointer<UInt8>, _: UnsafeRawPointer)
+@_silgen_name("print_long")
+func print_long(_: Int)
 
-var global: Int = 0
-public func print(_ n: Int) {
-    let f: StaticString = "%d\n"
-    global = n
-    vprintf(f.utf8Start, &global)
+public func print(_ n: Int, terminator: StaticString = "\n") {
+    print_long(n)
+    print("", terminator: terminator)
 }
 
 @_silgen_name("malloc")

test/embedded/custom-print.swift

@@ -1,12 +1,11 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -target arm64-apple-none-macho -Xcc -D__MACH__ -Xcc -D__arm64__ -Xcc -D__APPLE__ \
-// RUN:   -enable-experimental-feature Embedded -enforce-exclusivity=none %s -c -o %t/a.o
+// RUN: %target-swift-frontend -enable-experimental-feature Embedded -enforce-exclusivity=none %s -c -o %t/a.o
 // RUN: %target-clang %t/a.o -o %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s
 
 // REQUIRES: executable_test
 // REQUIRES: VENDOR=apple
-// REQUIRES: CPU=arm64
+// REQUIRES: OS=macosx
 
 @_silgen_name("putchar")
 func putchar(_: UInt8)

test/embedded/lto.swift

@@ -1,12 +1,11 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -target arm64-apple-none-macho -Xcc -D__MACH__ -Xcc -D__arm64__ -Xcc -D__APPLE__ \
-// RUN:   -lto=llvm-full %s -enable-experimental-feature Embedded -emit-bc -o %t/a.o
+// RUN: %target-swift-frontend -lto=llvm-full %s -enable-experimental-feature Embedded -emit-bc -o %t/a.o
 // RUN: %target-clang %t/a.o -o %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s
 
 // REQUIRES: executable_test
 // REQUIRES: VENDOR=apple
-// REQUIRES: CPU=arm64
+// REQUIRES: OS=macosx
 
 @_silgen_name("putchar")
 func putchar(_: UInt8)