Merge pull request #1411 from swiftwasm/master

[pull] swiftwasm from master

Author: kateinoigakukun

include/swift/AST/SILOptions.h

@@ -40,11 +40,6 @@ class SILOptions {
   /// Controls the aggressiveness of the loop unroller.
   int UnrollThreshold = 250;
 
-  /// Controls whether to pull in SIL from partial modules during the
-  /// merge modules step. Could perhaps be merged with the link mode
-  /// above but the interactions between all the flags are tricky.
-  bool MergePartialModules = false;
-
   /// Remove all runtime assertions during optimizations.
   bool RemoveRuntimeAsserts = false;
 

include/swift/AST/TypeCheckRequests.h

@@ -2444,7 +2444,7 @@ class HasImplementationOnlyImportsRequest
 
 class ResolveTypeRequest
     : public SimpleRequest<ResolveTypeRequest,
-                           Type(TypeResolution *, TypeRepr *),
+                           Type(const TypeResolution *, TypeRepr *),
                            RequestFlags::Uncached> {
 public:
   using SimpleRequest::SimpleRequest;
@@ -2457,7 +2457,7 @@ class ResolveTypeRequest
   friend SimpleRequest;
 
   // Evaluation.
-  Type evaluate(Evaluator &evaluator, TypeResolution *resolution,
+  Type evaluate(Evaluator &evaluator, const TypeResolution *resolution,
                 TypeRepr *repr) const;
 };
 

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -240,7 +240,8 @@ SWIFT_REQUEST(TypeChecker, ResolveTypeEraserTypeRequest,
               Type(ProtocolDecl *, TypeEraserAttr *),
               SeparatelyCached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, ResolveTypeRequest,
-              Type (TypeResolution *, TypeRepr *), Uncached, NoLocationInfo)
+              Type (const TypeResolution *, TypeRepr *),
+              Uncached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, SPIGroupsRequest,
               llvm::ArrayRef<Identifier>(Decl *),
               Cached, NoLocationInfo)

include/swift/ClangImporter/BuiltinMappedTypes.def

@@ -21,23 +21,32 @@
 //  - CLANG_BUILTIN_KIND is the kind of builtin type, clang::BuiltinType
 //  - SWIFT_TYPE_NAME is the name of the corresponding stdlib type.
 //
+// MAP_BUILTIN_CCHAR_TYPE(CLANG_BUILTIN_KIND, SWIFT_TYPE_NAME)
+//  - CLANG_BUILTIN_KIND is the kind of builtin type, clang::BuiltinType
+//  - SWIFT_TYPE_NAME is the name of the corresponding stdlib type.
+//
 //===----------------------------------------------------------------------===//
 
 #ifndef MAP_BUILTIN_INTEGER_TYPE
 #define MAP_BUILTIN_INTEGER_TYPE(CLANG, SWIFT) MAP_BUILTIN_TYPE(CLANG, SWIFT)
 #endif
 
+#ifndef MAP_BUILTIN_CCHAR_TYPE
+#define MAP_BUILTIN_CCHAR_TYPE(CLANG, SWIFT) MAP_BUILTIN_TYPE(CLANG, SWIFT)
+#endif
+
+MAP_BUILTIN_CCHAR_TYPE(Char_U,    CChar)
+MAP_BUILTIN_CCHAR_TYPE(Char_S,    CChar)
+MAP_BUILTIN_CCHAR_TYPE(WChar_S,   CWideChar)
+MAP_BUILTIN_CCHAR_TYPE(WChar_U,   CWideChar)
+
 MAP_BUILTIN_TYPE(Bool,      CBool)
-MAP_BUILTIN_INTEGER_TYPE(Char_U,    CChar)
-MAP_BUILTIN_INTEGER_TYPE(Char_S,    CChar)
 MAP_BUILTIN_INTEGER_TYPE(UChar,     CUnsignedChar)
 MAP_BUILTIN_INTEGER_TYPE(UShort,    CUnsignedShort)
 MAP_BUILTIN_INTEGER_TYPE(UInt,      CUnsignedInt)
 MAP_BUILTIN_INTEGER_TYPE(ULong,     CUnsignedLong)
 MAP_BUILTIN_INTEGER_TYPE(ULongLong, CUnsignedLongLong)
 MAP_BUILTIN_INTEGER_TYPE(UInt128,   CUnsignedInt128)
-MAP_BUILTIN_INTEGER_TYPE(WChar_S,   CWideChar)
-MAP_BUILTIN_INTEGER_TYPE(WChar_U,   CWideChar)
 MAP_BUILTIN_INTEGER_TYPE(Char16,    CChar16)
 MAP_BUILTIN_INTEGER_TYPE(Char32,    CChar32)
 MAP_BUILTIN_INTEGER_TYPE(SChar,     CSignedChar)
@@ -54,4 +63,4 @@ MAP_BUILTIN_TYPE(LongDouble, CLongDouble)
 
 #undef MAP_BUILTIN_TYPE
 #undef MAP_BUILTIN_INTEGER_TYPE
-
+#undef MAP_BUILTIN_CCHAR_TYPE

include/swift/Option/FrontendOptions.td

@@ -554,8 +554,9 @@ def sil_unroll_threshold : Separate<["-"], "sil-unroll-threshold">,
   MetaVarName<"<250>">,
   HelpText<"Controls the aggressiveness of loop unrolling">;
 
+// FIXME: This option is now redundant and should eventually be removed.
 def sil_merge_partial_modules : Flag<["-"], "sil-merge-partial-modules">,
-  HelpText<"Merge SIL from all partial swiftmodules into the final module">;
+  Alias<merge_modules>;
 
 def sil_verify_all : Flag<["-"], "sil-verify-all">,
   HelpText<"Verify SIL after each transform">;

include/swift/SIL/SILModule.h

@@ -561,10 +561,6 @@ class SILModule {
   /// i.e. it can be linked by linkFunction.
   bool hasFunction(StringRef Name);
 
-  /// Link all definitions in all segments that are logically part of
-  /// the same AST module.
-  void linkAllFromCurrentModule();
-
   /// Look up the SILWitnessTable representing the lowering of a protocol
   /// conformance, and collect the substitutions to apply to the referenced
   /// witnesses, if any.

include/swift/Serialization/SerializedSILLoader.h

@@ -74,10 +74,6 @@ class SerializedSILLoader {
 
   bool invalidateFunction(SILFunction *F);
 
-  /// Deserialize all SILFunctions, VTables, and WitnessTables in all
-  /// SILModules.
-  void getAll();
-
   /// Deserialize all SILFunctions, VTables, and WitnessTables for
   /// a given Module.
   ///

lib/ClangImporter/ClangImporter.cpp

@@ -2908,11 +2908,12 @@ void ClangModuleUnit::lookupValue(DeclName name, NLKind lookupKind,
 bool ClangImporter::Implementation::isVisibleClangEntry(
     const clang::NamedDecl *clangDecl) {
   // For a declaration, check whether the declaration is hidden.
-  if (!clangDecl->isHidden()) return true;
+  clang::Sema &clangSema = getClangSema();
+  if (clangSema.isVisible(clangDecl)) return true;
 
   // Is any redeclaration visible?
   for (auto redecl : clangDecl->redecls()) {
-    if (!cast<clang::NamedDecl>(redecl)->isHidden()) return true;
+    if (clangSema.isVisible(cast<clang::NamedDecl>(redecl))) return true;
   }
 
   return false;
@@ -3023,8 +3024,10 @@ void ClangImporter::loadExtensions(NominalTypeDecl *nominal,
     SmallVector<clang::NamedDecl *, 4> DelayedCategories;
 
     // Simply importing the categories adds them to the list of extensions.
-    for (const auto *Cat : objcClass->visible_categories()) {
-      Impl.importDeclReal(Cat, Impl.CurrentVersion);
+    for (const auto *Cat : objcClass->known_categories()) {
+      if (getClangSema().isVisible(Cat)) {
+        Impl.importDeclReal(Cat, Impl.CurrentVersion);
+      }
     }
   }
 

lib/ClangImporter/ImportDecl.cpp

@@ -7097,9 +7097,12 @@ void SwiftDeclConverter::importMirroredProtocolMembers(
           return;
 
         bool inNearbyCategory =
-            std::any_of(interfaceDecl->visible_categories_begin(),
-                        interfaceDecl->visible_categories_end(),
+            std::any_of(interfaceDecl->known_categories_begin(),
+                        interfaceDecl->known_categories_end(),
                         [=](const clang::ObjCCategoryDecl *category) -> bool {
+                          if (!Impl.getClangSema().isVisible(category)) {
+                            return false;
+                          }
                           if (category != decl) {
                             auto *categoryModule =
                                 Impl.getClangModuleForDecl(category);

lib/ClangImporter/ImportType.cpp

@@ -236,7 +236,9 @@ namespace {
       case clang::BuiltinType::CLANG_BUILTIN_KIND:                        \
         return unwrapCType(Impl.getNamedSwiftType(Impl.getStdlibModule(), \
                                         #SWIFT_TYPE_NAME));
-          
+#define MAP_BUILTIN_CCHAR_TYPE(CLANG_BUILTIN_KIND, SWIFT_TYPE_NAME)       \
+      case clang::BuiltinType::CLANG_BUILTIN_KIND:                        \
+        return Impl.getNamedSwiftType(Impl.getStdlibModule(), #SWIFT_TYPE_NAME);
 #include "swift/ClangImporter/BuiltinMappedTypes.def"
 
       // Types that cannot be mapped into Swift, and probably won't ever be.