Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

lib/Frontend/ParseableInterfaceModuleLoader.cpp

@@ -1441,7 +1441,7 @@ std::error_code ParseableInterfaceModuleLoader::findModuleFilesInDirectory(
                 CacheDir, PrebuiltCacheDir, ModuleID.second,
                 RemarkOnRebuildFromInterface, dependencyTracker,
                 llvm::is_contained(PreferInterfaceForModules,
-                                   ModuleName)?
+                                   ModuleName) ?
                   ModuleLoadingMode::PreferParseable : LoadMode);
 
   // Ask the impl to find us a module that we can load or give us an error

lib/SILGen/SILGenLValue.cpp

@@ -3621,7 +3621,6 @@ SILValue SILGenFunction::emitConversionToSemanticRValue(SILLocation loc,
   case ReferenceOwnership::Name: {                                             \
     /* For static reference storage types, we need to strip the box and */     \
     /* then do an (unsafe) retain. */                                          \
-    auto type = storageType.castTo<Name##StorageType>();                       \
     return B.createCopy##Name##Value(loc, src);                                \
   }
 #include "swift/AST/ReferenceStorage.def"
@@ -3702,7 +3701,6 @@ static SILValue emitLoadOfSemanticRValue(SILGenFunction &SGF,
 #define UNCHECKED_REF_STORAGE(Name, ...)                                       \
   case ReferenceOwnership::Name: {                                             \
     /* For static reference storage types, we need to strip the box. */        \
-    auto type = storageType.castTo<Name##StorageType>();                       \
     auto value = SGF.B.createLoad(loc, src, LoadOwnershipQualifier::Trivial);  \
     return SGF.B.createCopy##Name##Value(loc, value);                          \
   }

test/api-digester/Outputs/Cake-binary-vs-interface.txt

@@ -0,0 +1,2 @@
+// We shouldn't see this. rdar://54797231
+cake: Class C4 is now with @objc

test/api-digester/Outputs/Cake-interface-vs-binary.txt

@@ -7,7 +7,7 @@
 // RUN: %target-swift-frontend -typecheck -emit-parseable-module-interface-path %t.mod1/cake.swiftinterface %S/Inputs/cake_baseline/cake.swift -I %S/Inputs/APINotesLeft %clang-importer-sdk-nosource -parse-as-library -enable-library-evolution -disable-objc-attr-requires-foundation-module -module-cache-path %t.module-cache
 
 // Generate .swiftmodule file for module cake
-// RUN: %target-swift-frontend -emit-module -o %t.mod1/cake.swiftmodule %S/Inputs/cake_baseline/cake.swift -I %S/Inputs/APINotesLeft %clang-importer-sdk-nosource -parse-as-library  -disable-objc-attr-requires-foundation-module -module-cache-path %t.module-cache
+// RUN: %target-swift-frontend -emit-module -o %t.mod1/cake.swiftmodule %S/Inputs/cake_baseline/cake.swift -I %S/Inputs/APINotesLeft %clang-importer-sdk-nosource -parse-as-library  -disable-objc-attr-requires-foundation-module -module-cache-path %t.module-cache -enable-library-evolution
 
 // Dump Json file for cake ABI via .swiftmodule file
 // RUN: %api-digester -dump-sdk -module cake -o - -module-cache-path %t.module-cache %clang-importer-sdk-nosource -I %t.mod1 -I %S/Inputs/APINotesLeft -abi > %t.dump1.json
@@ -18,6 +18,6 @@
 // Compare two Json files and we should see some differences.
 // RUN: %api-digester -diagnose-sdk -print-module --input-paths %t.dump1.json -input-paths %t.dump2.json -abi -o %t.result
 
-// RUN: %clang -E -P -x c %S/Outputs/Cake-interface-vs-binary.txt -o - | sed '/^\s*$/d' > %t.expected
+// RUN: %clang -E -P -x c %S/Outputs/Cake-binary-vs-interface.txt -o - | sed '/^\s*$/d' > %t.expected
 // RUN: %clang -E -P -x c %t.result -o - | sed '/^\s*$/d' > %t.result.tmp
 // RUN: diff -u %t.expected %t.result.tmp