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

Author: swift-ci

include/swift/SIL/SILLocation.h

@@ -69,8 +69,6 @@ class SILLocation {
 
 public:
   enum LocationKind : unsigned {
-    // FIXME: NoneKind is to be removed.
-    NoneKind = 0,
     RegularKind = 1,
     ReturnKind = 2,
     ImplicitReturnKind = 3,

lib/SIL/SILPrinter.cpp

@@ -760,9 +760,6 @@ class SILPrinter : public SILInstructionVisitor<SILPrinter> {
 
       // Print the type of location.
       switch (L.getKind()) {
-      case SILLocation::NoneKind:
-        assert(L.isAutoGenerated() && "This kind shouldn't be printed.");
-        break;
       case SILLocation::RegularKind:
         break;
       case SILLocation::ReturnKind: