Resolve conflicts with master

include/swift/Frontend/BackDeploymentLibs.def

@@ -0,0 +1,31 @@
+//===------ BackDeploymentLibs.def - Backward Deployment Libraries --------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+// Enumerates the backward deployment libraries that need to be linked
+// into Swift targets. Clients of this file must define the macro
+//
+//   BACK_DEPLOYMENT_LIB(Version, Filter, LibraryName)
+//
+// where:
+//   Version is a maximum Swift version written like a tuple, e.g., (5, 1)
+//   Filter is one of executable or all.
+//   LibraryName is the name of the library, e.g., "swiftCompatibility51"
+//===----------------------------------------------------------------------===//
+
+#ifndef BACK_DEPLOYMENT_LIB
+#  error "Must define BACK_DEPLOYMENT_LIB(Version, Filter, Library)"
+#endif
+
+BACK_DEPLOYMENT_LIB((5, 0), all, "swiftCompatibility50")
+BACK_DEPLOYMENT_LIB((5, 1), all, "swiftCompatibility51")
+BACK_DEPLOYMENT_LIB((5, 0), executable, "swiftCompatibilityDynamicReplacements")
+
+#undef BACK_DEPLOYMENT_LIB

include/swift/SIL/SILFunctionConventions.h

@@ -396,6 +396,9 @@ class SILFunctionConventions {
   /// Return the SIL type of the apply/entry argument at the given index.
   SILType getSILArgumentType(unsigned index,
                              TypeExpansionContext context) const;
+
+  /// Returns true if this function does not return to the caller.
+  bool isNoReturn(TypeExpansionContext context) const;
 };
 
 struct SILFunctionConventions::SILResultTypeFunc {
@@ -464,6 +467,11 @@ SILFunctionConventions::getSILArgumentType(unsigned index,
       funcTy->getParameters()[index - getNumIndirectSILResults()], context);
 }
 
+inline bool
+SILFunctionConventions::isNoReturn(TypeExpansionContext context) const {
+  return funcTy->isNoReturnFunction(silConv.getModule(), context);
+}
+
 inline SILFunctionConventions
 SILModuleConventions::getFunctionConventions(CanSILFunctionType funcTy) {
   return SILFunctionConventions(funcTy, *this);

include/swift/SILOptimizer/Differentiation/JVPEmitter.h → include/swift/SILOptimizer/Differentiation/JVPCloner.h

@@ -1,4 +1,4 @@
-//===--- JVPEmitter.h - JVP Generation in Differentiation -----*- C++ -*---===//
+//===--- JVPCloner.h - JVP function generation ----------------*- C++ -*---===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -15,8 +15,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_JVPEMITTER_H
-#define SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_JVPEMITTER_H
+#ifndef SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_JVPCLONER_H
+#define SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_JVPCLONER_H
 
 #include "swift/SILOptimizer/Differentiation/AdjointValue.h"
 #include "swift/SILOptimizer/Differentiation/DifferentiationInvoker.h"
@@ -40,8 +40,8 @@ namespace autodiff {
 
 class ADContext;
 
-class JVPEmitter final
-    : public TypeSubstCloner<JVPEmitter, SILOptFunctionBuilder> {
+class JVPCloner final
+    : public TypeSubstCloner<JVPCloner, SILOptFunctionBuilder> {
 private:
   /// The global context.
   ADContext &context;
@@ -368,9 +368,9 @@ class JVPEmitter final
   void prepareForDifferentialGeneration();
 
 public:
-  explicit JVPEmitter(ADContext &context, SILFunction *original,
-                      SILDifferentiabilityWitness *witness, SILFunction *jvp,
-                      DifferentiationInvoker invoker);
+  explicit JVPCloner(ADContext &context, SILFunction *original,
+                     SILDifferentiabilityWitness *witness, SILFunction *jvp,
+                     DifferentiationInvoker invoker);
 
   static SILFunction *
   createEmptyDifferential(ADContext &context,
@@ -411,4 +411,4 @@ class JVPEmitter final
 } // end namespace autodiff
 } // end namespace swift
 
-#endif // SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_VJPEMITTER_H
+#endif // SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_JVPCLONER_H