Merge pull request #2082 from swiftwasm/main

pull[bot] · web-flow · commit 16c320df5e56 · 2020-10-24T04:20:54.000Z
[pull] swiftwasm from main
diff --git a/docs/Driver.md b/docs/Driver.md
@@ -205,7 +205,7 @@ in becoming more like non-whole-module builds.
 
 ## Incremental Builds ##
 
-Incremental builds in Swift work by primarily by cross-file dependency
+Incremental builds in Swift work primarily by cross-file dependency
 analysis, described in [DependencyAnalysis.md](DependencyAnalysis.md).
 Compiling a single file might be necessary because that file has changed, but
 it could also be because that file depends on something else that might have
diff --git a/lib/ClangImporter/ImportDecl.cpp b/lib/ClangImporter/ImportDecl.cpp
@@ -1390,7 +1390,8 @@ createValueConstructor(ClangImporter::Implementation &Impl,
         continue;
 
       if (auto clangField = dyn_cast<clang::FieldDecl>(var->getClangDecl()))
-        if (clangField->isAnonymousStructOrUnion())
+        if (clangField->isAnonymousStructOrUnion() ||
+            clangField->getDeclName().isEmpty())
           generateParamName = false;
     }
 
@@ -2397,6 +2398,8 @@ namespace {
             if (field->isAnonymousStructOrUnion()) {
               IdStream << "__Anonymous_field" << field->getFieldIndex();
             } else {
+              assert(!field->getDeclName().isEmpty() &&
+                     "Microsoft anonymous struct extension?");
               IdStream << field->getName();
             }
             ImportedName Result;
@@ -4011,7 +4014,7 @@ namespace {
       Optional<ImportedName> correctSwiftName;
       ImportedName importedName;
 
-      if (!decl->isAnonymousStructOrUnion()) {
+      if (!decl->isAnonymousStructOrUnion() && !decl->getDeclName().isEmpty()) {
         importedName = importFullName(decl, correctSwiftName);
         if (!importedName) {
           return nullptr;
diff --git a/lib/SILOptimizer/PassManager/PassPipeline.cpp b/lib/SILOptimizer/PassManager/PassPipeline.cpp
@@ -300,7 +300,8 @@ void addFunctionPasses(SILPassPipelinePlan &P,
   P.addMem2Reg();
 
   // We earlier eliminated ownership if we are not compiling the stdlib. Now
-  // handle the stdlib functions.
+  // handle the stdlib functions, re-simplifying, eliminating ARC as we do.
+  P.addSemanticARCOpts();
   P.addNonTransparentFunctionOwnershipModelEliminator();
 
   // Run the existential specializer Pass.
diff --git a/lib/SILOptimizer/SemanticARC/SemanticARCOpts.cpp b/lib/SILOptimizer/SemanticARC/SemanticARCOpts.cpp
@@ -100,8 +100,10 @@ struct SemanticARCOpts : SILFunctionTransform {
   void run() override {
     SILFunction &f = *getFunction();
 
-    // Return early if we are not performing OSSA optimizations.
-    if (!f.getModule().getOptions().EnableOSSAOptimizations)
+    // Return early if we are not performing OSSA optimizations or we are not in
+    // ownership.
+    if (!f.getModule().getOptions().EnableOSSAOptimizations ||
+        !f.hasOwnership())
       return;
 
     // Make sure we are running with ownership verification enabled.
diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt
@@ -69,10 +69,6 @@ option(SWIFT_STDLIB_OS_VERSIONING
     "Build stdlib with availability based on OS versions (Darwin only)."
     TRUE)
 
-option(SWIFT_COMPILE_DIFFERENTIATION_WITHOUT_TGMATH
-       "Build Differentation without tgmath (and dependency on platform runtime libraries)"
-       FALSE)
-
 #
 # End of user-configurable options.
 #
diff --git a/stdlib/public/CMakeLists.txt b/stdlib/public/CMakeLists.txt
@@ -95,15 +95,7 @@ if(SWIFT_BUILD_STDLIB)
   endif()
 
   if(SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING)
-    if(SWIFT_COMPILE_DIFFERENTIATION_WITHOUT_TGMATH)
-      # Use a different CMakeLists.txt for this configuration
-      # while sharing the bulk of the code
-      # This way we will reduce any side effect on the main configuration
-      # and increase the readability of the CMake code
-      add_subdirectory(Differentiation_NoTgMath)
-    else()
-      add_subdirectory(Differentiation)
-    endif()
+    add_subdirectory(Differentiation)
   endif()
 
   if(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY)
diff --git a/stdlib/public/Differentiation_NoTgMath/CMakeLists.txt b/stdlib/public/Differentiation_NoTgMath/CMakeLists.txt
diff --git a/stdlib/public/SwiftShims/CMakeLists.txt b/stdlib/public/SwiftShims/CMakeLists.txt
@@ -223,8 +223,8 @@ endif()
 # need to use a different version of the headers than the installed Clang. This
 # should be used in conjunction with clang-resource-dir-symlink.
 file(TO_CMAKE_PATH "${LLVM_LIBRARY_OUTPUT_INTDIR}"
-  _SWIFT_SHIMS_PATH_TO_CLANG_BUILD)
-swift_install_in_component(DIRECTORY "${_SWIFT_SHIMS_PATH_TO_CLANG_BUILD}/lib/clang"
+  _SWIFT_SHIMS_PATH_TO_CLANG_LIB_BUILD)
+swift_install_in_component(DIRECTORY "${_SWIFT_SHIMS_PATH_TO_CLANG_LIB_BUILD}/clang"
                            DESTINATION "lib"
                            COMPONENT clang-builtin-headers-in-clang-resource-dir
                            PATTERN "*.h")
diff --git a/test/ClangImporter/Inputs/ctypes_msvc.h b/test/ClangImporter/Inputs/ctypes_msvc.h
@@ -0,0 +1,8 @@
+
+typedef struct S {
+  unsigned char uc;
+} S;
+
+typedef struct T {
+  S;
+} T;
diff --git a/test/ClangImporter/ctypes_parse_msvc.swift b/test/ClangImporter/ctypes_parse_msvc.swift
@@ -0,0 +1,4 @@
+// RUN: %target-swift-frontend -Xcc -fms-extensions -import-objc-header %S/Inputs/ctypes_msvc.h -typecheck -verify %s
+
+_ = T().uc
+_ = T(S(uc: 0))
diff --git a/test/Interop/C/modules/print-qualified-clang-types/Inputs/HelperModule.swift b/test/Interop/C/modules/print-qualified-clang-types/Inputs/HelperModule.swift
@@ -0,0 +1,2 @@
+import ForeignA
+@_exported import ForeignB
diff --git a/test/Interop/C/modules/print-qualified-clang-types/Inputs/MainModule.swift b/test/Interop/C/modules/print-qualified-clang-types/Inputs/MainModule.swift
@@ -0,0 +1,3 @@
+import HelperModule
+
+public func funcTakingForeignStruct(_ param: ForeignStruct) {}
diff --git a/test/Interop/C/modules/print-qualified-clang-types/Inputs/foreign-a.h b/test/Interop/C/modules/print-qualified-clang-types/Inputs/foreign-a.h
@@ -0,0 +1 @@
+#include "textual-header.h"
diff --git a/test/Interop/C/modules/print-qualified-clang-types/Inputs/foreign-b.h b/test/Interop/C/modules/print-qualified-clang-types/Inputs/foreign-b.h
@@ -0,0 +1 @@
+#include "textual-header.h"
diff --git a/test/Interop/C/modules/print-qualified-clang-types/Inputs/module.modulemap b/test/Interop/C/modules/print-qualified-clang-types/Inputs/module.modulemap
@@ -0,0 +1,13 @@
+module ForeignA {
+  // Nest the header in a sub-module to make sure these are handled correctly.
+  module Sub {
+    header "foreign-a.h"
+  }
+}
+
+module ForeignB {
+  // Nest the header in a sub-module to make sure these are handled correctly.
+  module Sub {
+    header "foreign-b.h"
+  }
+}
diff --git a/test/Interop/C/modules/print-qualified-clang-types/Inputs/textual-header.h b/test/Interop/C/modules/print-qualified-clang-types/Inputs/textual-header.h
@@ -0,0 +1 @@
+typedef struct {} ForeignStruct;
diff --git a/test/Interop/C/modules/print-qualified-clang-types/print-qualified-clang-types.swift b/test/Interop/C/modules/print-qualified-clang-types/print-qualified-clang-types.swift
@@ -0,0 +1,36 @@
+// Check that when qualifying Clang types with a module name, we choose a
+// visible module. Clang types need special treatment because multiple Clang
+// modules can contain the same type declarations from a textually included
+// header, but not all of these modules may be visible. If we choose a module
+// that isn't visible, we produce `.swiftinterface` files that don't compile.
+//
+// To test this, the test sets up the following structure:
+//
+// MainModule (Swift module)
+//   import HelperModule (Swift module)
+//     import ForeignA (Clang module)
+//       #include "textual-header.h"
+//     @_exported import ForeignB (Clang module)
+//       #include "textual-header.h"
+//
+// `ForeignA` and `ForeignB` both include the same textual header, which
+// defines the struct `ForeignStruct`.
+//
+// Because `ForeignB` is re-exported by `HelperModule`, it is visible from
+// `MainModule`, but `ForeignA` is not. This means that when `ForeignStruct` is
+// used in `MainModule`, its qualified name should be printed as
+// `ForeignB.ForeignStruct`, not `ForeignA.ForeignStruct`.
+//
+// In addition to checking for the presence of the expected string in the
+// `.swiftinterface` file, we also verify that it compiles without error.
+//
+// This is a regression test for https://bugs.swift.org/browse/SR-13032.
+
+// RUN: %empty-directory(%t)
+// RUN: mkdir %t/helper_module %t/main_module
+// RUN: %target-swift-frontend -enable-library-evolution -swift-version 5 -emit-module -o %t/helper_module/HelperModule.swiftmodule %S/Inputs/HelperModule.swift -I %S/Inputs
+// RUN: %target-swift-frontend -enable-library-evolution -swift-version 5 -emit-module -o %t/main_module/MainModule.swiftmodule -emit-module-interface-path %t/main_module/MainModule.swiftinterface -I %t/helper_module %S/Inputs/MainModule.swift -I %S/Inputs
+// RUN: %FileCheck --input-file=%t/main_module/MainModule.swiftinterface %s
+// RUN: %target-swift-frontend -typecheck -swift-version 5 %t/main_module/MainModule.swiftinterface -I %t/helper_module -I %S/Inputs
+
+// CHECK: public func funcTakingForeignStruct(_ param: ForeignB.ForeignStruct)

Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,6 @@ option(SWIFT_STDLIB_OS_VERSIONING`
`69`	`69`	`"Build stdlib with availability based on OS versions (Darwin only)."`
`70`	`70`	`TRUE)`
`71`	`71`
`72`		`-option(SWIFT_COMPILE_DIFFERENTIATION_WITHOUT_TGMATH`
`73`		`- "Build Differentation without tgmath (and dependency on platform runtime libraries)"`
`74`		`- FALSE)`
`75`		`-`
`76`	`72`	`#`
`77`	`73`	`# End of user-configurable options.`
`78`	`74`	`#`