Update master-next for upstream changes

Author: JDevlieghere

lib/IRGen/MetadataRequest.cpp

@@ -2074,11 +2074,11 @@ emitMetadataAccessByMangledName(IRGenFunction &IGF, CanType type,
   }
 
   // Get or create a shared helper function to do the instantiation.
-  auto instantiationFn = cast<llvm::Function>(
-       IGM.getModule()
-         ->getOrInsertFunction("__swift_instantiateConcreteTypeFromMangledName",
-                               IGF.IGM.TypeMetadataPtrTy, cache->getType())
-         ->stripPointerCasts());
+  auto *instantiationFnTy = llvm::FunctionType::get(IGF.IGM.TypeMetadataPtrTy,
+                                                    {cache->getType()}, false);
+  auto instantiationFn = llvm::Function::Create(
+      instantiationFnTy, llvm::Function::ExternalLinkage,
+      "__swift_instantiateConcreteTypeFromMangledName", IGM.getModule());
   if (instantiationFn->empty()) {
     ApplyIRLinkage(IRLinkage::InternalLinkOnceODR)
       .to(instantiationFn);

lib/SIL/AbstractionPattern.cpp

@@ -366,8 +366,7 @@ AbstractionPattern::getCXXMethodSelfPattern(CanType selfType) const {
     // Use the clang type for the receiver type.  If this is ever
     // insufficient --- if we have interesting bridging to do to
     // 'self' --- we have the right information to be more exact.
-    auto clangSelfType =
-        CXXMethod->getThisType(CXXMethod->getASTContext()).getTypePtr();
+    auto clangSelfType = CXXMethod->getThisType().getTypePtr();
     return AbstractionPattern(getGenericSignatureForFunctionComponent(),
                               selfType, clangSelfType);
   }

lib/TBDGen/tapi/YAML.cpp

@@ -191,16 +191,15 @@ QuotingType ScalarTraits<UUID>::mustQuote(StringRef) {
   return QuotingType::Single;
 }
 
-using clang::InputKind;
-void ScalarEnumerationTraits<InputKind::Language>::enumeration(
-    IO &io, InputKind::Language &kind) {
-  io.enumCase(kind, "c", InputKind::C);
-  io.enumCase(kind, "cxx", InputKind::CXX);
-  io.enumCase(kind, "objective-c", InputKind::ObjC);
-  io.enumCase(kind, "objc", InputKind::ObjC); // to keep old snapshots working.
-  io.enumCase(kind, "objective-cxx", InputKind::ObjCXX);
+using clang::Language;
+void ScalarEnumerationTraits<Language>::enumeration(IO &io, Language &kind) {
+  io.enumCase(kind, "c", Language::C);
+  io.enumCase(kind, "cxx", Language::CXX);
+  io.enumCase(kind, "objective-c", Language::ObjC);
+  io.enumCase(kind, "objc", Language::ObjC); // to keep old snapshots working.
+  io.enumCase(kind, "objective-cxx", Language::ObjCXX);
   io.enumCase(kind, "objcxx",
-              InputKind::ObjCXX); // to keep old snapshots working.
+              Language::ObjCXX); // to keep old snapshots working.
 }
 
 } // end namespace yaml.

lib/TBDGen/tapi/YAML.h

@@ -91,8 +91,8 @@ template <> struct ScalarTraits<UUID> {
 };
 
 using clang::InputKind;
-template <> struct ScalarEnumerationTraits<InputKind::Language> {
-  static void enumeration(IO &io, InputKind::Language &kind);
+template <> struct ScalarEnumerationTraits<clang::Language> {
+  static void enumeration(IO &io, clang::Language &kind);
 };
 
 } // end namespace yaml.