---

yaml
---
r: 344475
b: refs/heads/swift-5.1-branch-08-28-2019
c: aac9b64
h: refs/heads/master
i:
  344473: bfbe369
  344471: 645196d

Author: jckarter

[refs]

@@ -1508,4 +1508,4 @@ refs/heads/revert-27301-syntaxparse-associatedtype: 859f90afc1557bf5600de108927b
 refs/heads/shahmishal/pr-test-swift: 868c7a884713b910757f2f3d4c413e395aeba76c
 refs/heads/shahmishal/pr-test-swift-2: fa33242bb6401b5206e2e3ce50624febfc469625
 refs/heads/swift-5.1-branch-07-24-2019: 0450b7d81e75701c325138e6af52d470bb3dafdd
-refs/heads/swift-5.1-branch-08-28-2019: c370c4d0c04414b57a0a9e7fcbcdcef8e4e393ad
+refs/heads/swift-5.1-branch-08-28-2019: aac9b6443cc7fd3dc7b6af8796d1dd7000429996

branches/swift-5.1-branch-08-28-2019/include/swift/AST/DiagnosticsModuleDiffer.def

@@ -96,8 +96,6 @@ ERROR(decl_new_witness_table_entry,none,"%0 now requires %select{|no}1 new witne
 
 ERROR(new_decl_without_intro,none,"%0 is a new API without @available attribute", (StringRef))
 
-ERROR(objc_name_change,none,"%0 has ObjC name change from %1 to %2", (StringRef, StringRef, StringRef))
-
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG

branches/swift-5.1-branch-08-28-2019/include/swift/Frontend/FrontendOptions.h

@@ -76,9 +76,6 @@ class FrontendOptions {
   /// binary module has already been built for use by the compiler.
   std::string PrebuiltModuleCachePath;
 
-  /// For these modules, we should prefer using Swift interface when importing them.
-  std::vector<std::string> PreferInterfaceForModules;
-
   /// Emit index data for imported serialized swift system modules.
   bool IndexSystemModules = false;
 

branches/swift-5.1-branch-08-28-2019/include/swift/Frontend/ParseableInterfaceModuleLoader.h

@@ -128,18 +128,15 @@ class ParseableInterfaceModuleLoader : public SerializedModuleLoaderBase {
   explicit ParseableInterfaceModuleLoader(
       ASTContext &ctx, StringRef cacheDir, StringRef prebuiltCacheDir,
       DependencyTracker *tracker, ModuleLoadingMode loadMode,
-      ArrayRef<std::string> PreferInterfaceForModules,
       bool RemarkOnRebuildFromInterface)
   : SerializedModuleLoaderBase(ctx, tracker, loadMode),
   CacheDir(cacheDir), PrebuiltCacheDir(prebuiltCacheDir),
-  RemarkOnRebuildFromInterface(RemarkOnRebuildFromInterface),
-  PreferInterfaceForModules(PreferInterfaceForModules)
+  RemarkOnRebuildFromInterface(RemarkOnRebuildFromInterface)
   {}
 
   std::string CacheDir;
   std::string PrebuiltCacheDir;
   bool RemarkOnRebuildFromInterface;
-  ArrayRef<std::string> PreferInterfaceForModules;
 
   std::error_code findModuleFilesInDirectory(
     AccessPathElem ModuleID, StringRef DirPath, StringRef ModuleFilename,
@@ -153,12 +150,10 @@ class ParseableInterfaceModuleLoader : public SerializedModuleLoaderBase {
   static std::unique_ptr<ParseableInterfaceModuleLoader>
   create(ASTContext &ctx, StringRef cacheDir, StringRef prebuiltCacheDir,
          DependencyTracker *tracker, ModuleLoadingMode loadMode,
-         ArrayRef<std::string> PreferInterfaceForModules = {},
          bool RemarkOnRebuildFromInterface = false) {
     return std::unique_ptr<ParseableInterfaceModuleLoader>(
       new ParseableInterfaceModuleLoader(ctx, cacheDir, prebuiltCacheDir,
                                          tracker, loadMode,
-                                         PreferInterfaceForModules,
                                          RemarkOnRebuildFromInterface));
   }
 

branches/swift-5.1-branch-08-28-2019/include/swift/IDE/DigesterEnums.def

@@ -143,22 +143,18 @@ KEY_STRING(ModuleName, moduleName)
 KEY_STRING(SuperclassUsr, superclassUsr)
 KEY_STRING(EnumRawTypeName, enumRawTypeName)
 KEY_STRING(GenericSig, genericSig)
-KEY_STRING(SugaredGenericSig, sugared_genericSig)
 KEY_STRING(FuncSelfKind, funcSelfKind)
 KEY_STRING(ParamValueOwnership, paramValueOwnership)
 KEY_STRING(IntromacOS, intro_Macosx)
 KEY_STRING(IntroiOS, intro_iOS)
 KEY_STRING(IntrotvOS, intro_tvOS)
 KEY_STRING(IntrowatchOS, intro_watchOS)
 KEY_STRING(Introswift, intro_swift)
-KEY_STRING(ObjCName, objc_name)
 
 KEY_STRING_ARR(SuperclassNames, superclassNames)
-KEY_STRING_ARR(ToolArgs, tool_arguments)
 
 KEY_UINT(SelfIndex, selfIndex)
 KEY_UINT(FixedBinaryOrder, fixedbinaryorder)
-KEY_UINT(JsonFormatVer, json_format_version)
 
 KEY(children)
 KEY(conformances)

branches/swift-5.1-branch-08-28-2019/lib/Frontend/Frontend.cpp

@@ -361,8 +361,7 @@ bool CompilerInstance::setUpModuleLoaders() {
     StringRef PrebuiltModuleCachePath = FEOpts.PrebuiltModuleCachePath;
     auto PIML = ParseableInterfaceModuleLoader::create(
         *Context, ModuleCachePath, PrebuiltModuleCachePath,
-        getDependencyTracker(), MLM, FEOpts.PreferInterfaceForModules,
-        FEOpts.RemarkOnRebuildFromModuleInterface);
+        getDependencyTracker(), MLM, FEOpts.RemarkOnRebuildFromModuleInterface);
     Context->addModuleLoader(std::move(PIML));
   }
   Context->addModuleLoader(std::move(SML));

branches/swift-5.1-branch-08-28-2019/lib/Frontend/ParseableInterfaceModuleLoader.cpp

@@ -1425,14 +1425,11 @@ std::error_code ParseableInterfaceModuleLoader::findModuleFilesInDirectory(
   }
 
   // Create an instance of the Impl to do the heavy lifting.
-  auto ModuleName = ModuleID.first.str();
   ParseableInterfaceModuleLoaderImpl Impl(
-                Ctx, ModPath, InPath, ModuleName,
+                Ctx, ModPath, InPath, ModuleID.first.str(),
                 CacheDir, PrebuiltCacheDir, ModuleID.second,
                 RemarkOnRebuildFromInterface, dependencyTracker,
-                llvm::is_contained(PreferInterfaceForModules,
-                                   ModuleName) ?
-                  ModuleLoadingMode::PreferParseable : LoadMode);
+                LoadMode);
 
   // Ask the impl to find us a module that we can load or give us an error
   // telling us that we couldn't load it.

branches/swift-5.1-branch-08-28-2019/stdlib/toolchain/Compatibility50/Overrides.cpp

@@ -36,3 +36,56 @@ __attribute__((used, section("__DATA,__swift_hooks"))) = {
 __attribute__((weak, visibility("hidden")))
 extern "C"
 char _swift_FORCE_LOAD_$_swiftCompatibility50 = 0;
+
+// Put a getClass hook in front of the system Swift runtime's hook to prevent it
+// from trying to interpret symbolic references. rdar://problem/55036306
+
+// FIXME: delete this #if and dlsym once we don't
+// need to build with older libobjc headers
+#if !OBJC_GETCLASSHOOK_DEFINED
+using objc_hook_getClass =  BOOL(*)(const char * _Nonnull name,
+                                    Class _Nullable * _Nonnull outClass);
+#endif
+static objc_hook_getClass OldGetClassHook;
+
+static BOOL
+getObjCClassByMangledName_untrusted(const char * _Nonnull typeName,
+                                    Class _Nullable * _Nonnull outClass) {
+  // Scan the string for byte sequences that might be recognized as
+  // symbolic references, and reject them.
+  for (const char *c = typeName; *c != 0; ++c) {
+    if (*c < 0x20) {
+      *outClass = Nil;
+      return NO;
+    }
+  }
+  
+  if (OldGetClassHook) {
+    return OldGetClassHook(typeName, outClass);
+  }
+  // In case the OS runtime for some reason didn't install a hook, fallback to
+  // NO.
+  return NO;
+}
+
+__attribute__((constructor))
+static void installGetClassHook_untrusted() {
+  // FIXME: delete this #if and dlsym once we don't
+  // need to build with older libobjc headers
+#if !OBJC_GETCLASSHOOK_DEFINED
+  using objc_hook_getClass =  BOOL(*)(const char * _Nonnull name,
+                                      Class _Nullable * _Nonnull outClass);
+  auto objc_setHook_getClass =
+    (void(*)(objc_hook_getClass _Nonnull,
+             objc_hook_getClass _Nullable * _Nonnull))
+    dlsym(RTLD_DEFAULT, "objc_setHook_getClass");
+#endif
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability"
+  if (objc_setHook_getClass) {
+    objc_setHook_getClass(getObjCClassByMangledName_untrusted,
+                          &OldGetClassHook);
+  }
+#pragma clang diagnostic pop
+}

branches/swift-5.1-branch-08-28-2019/test/api-digester/Inputs/cake.swift

@@ -3,7 +3,6 @@
 public protocol P1 {}
 public protocol P2 {}
 public protocol P3: P2, P1 {}
-
 @frozen
 public struct S1: P1 {
   public static func foo1() {}
@@ -124,18 +123,3 @@ public class PlatformIntroClass {}
 
 @available(swift, introduced: 5)
 public class SwiftIntroClass {}
-
-@objc(NewObjCClass)
-public class SwiftObjcClass {
-  @objc(ObjCFool:ObjCA:ObjCB:)
-  public func foo(a:Int, b:Int, c: Int) {}
-}
-
-@available(iOS 10.2, tvOS 10.3, watchOS 3.4, *)
-@available(macOS, unavailable)
-public class UnavailableOnMac {}
-
-@available(macOS, unavailable)
-extension SwiftObjcClass {
-  public func functionUnavailableOnMac() {}
-}

branches/swift-5.1-branch-08-28-2019/test/api-digester/Inputs/cake_baseline/cake.swift

@@ -195,9 +195,3 @@ public class Zoo {
 }
 
 public func returnFunctionTypeOwnershipChange() -> (C1) -> () { return { _ in } }
-
-@objc(OldObjCClass)
-public class SwiftObjcClass {
-  @objc(OldObjCFool:OldObjCA:OldObjCB:)
-  public func foo(a:Int, b:Int, c: Int) {}
-}

branches/swift-5.1-branch-08-28-2019/test/api-digester/Inputs/cake_current/cake.swift

@@ -202,9 +202,3 @@ public class Zoo {
 }
 
 public func returnFunctionTypeOwnershipChange() -> (__owned C1) -> () { return { _ in } }
-
-@objc(NewObjCClass)
-public class SwiftObjcClass {
-  @objc(NewObjCFool:NewObjCA:NewObjCB:)
-  public func foo(a:Int, b:Int, c: Int) {}
-}