ClangImporter: Remove ConstantConvertKind::{Coerce,Downcast}

Author: slavapestov

lib/ClangImporter/ImportDecl.cpp

@@ -3381,7 +3381,7 @@ namespace {
         // Create the global constant.
         auto result = Impl.createConstant(name, dc, type,
                                           clang::APValue(decl->getInitVal()),
-                                          ConstantConvertKind::Coerce,
+                                          ConstantConvertKind::None,
                                           /*static*/dc->isTypeContext(), decl);
         Impl.ImportedDecls[{decl->getCanonicalDecl(), getVersion()}] = result;
 
@@ -8285,16 +8285,6 @@ ClangImporter::Implementation::createConstant(Identifier name, DeclContext *dc,
         expr = new (C) ForceValueExpr(expr, SourceLoc());
       break;
     }
-
-    case ConstantConvertKind::Coerce:
-      break;
-
-    case ConstantConvertKind::Downcast: {
-      expr = new (C) ForcedCheckedCastExpr(expr, SourceLoc(), SourceLoc(),
-                                           TypeLoc::withoutLoc(type));
-      expr->setImplicit();
-      break;
-    }
     }
 
     // Create the return statement.

lib/ClangImporter/ImportMacro.cpp

@@ -125,7 +125,7 @@ static ValueDecl *importNumericLiteral(ClangImporter::Implementation &Impl,
 
       return createMacroConstant(Impl, MI, name, DC, constantType,
                                  clang::APValue(value),
-                                 ConstantConvertKind::Coerce,
+                                 ConstantConvertKind::None,
                                  /*static*/ false, ClangN);
     }
 
@@ -143,7 +143,7 @@ static ValueDecl *importNumericLiteral(ClangImporter::Implementation &Impl,
 
       return createMacroConstant(Impl, MI, name, DC, constantType,
                                  clang::APValue(value),
-                                 ConstantConvertKind::Coerce,
+                                 ConstantConvertKind::None,
                                  /*static*/ false, ClangN);
     }
     // TODO: Other numeric literals (complex, imaginary, etc.)
@@ -186,7 +186,7 @@ static ValueDecl *importStringLiteral(ClangImporter::Implementation &Impl,
     return nullptr;
 
   return Impl.createConstant(name, DC, importTy, parsed->getString(),
-                             ConstantConvertKind::Coerce, /*static*/ false,
+                             ConstantConvertKind::None, /*static*/ false,
                              ClangN);
 }
 
@@ -598,7 +598,7 @@ static ValueDecl *importMacro(ClangImporter::Implementation &impl,
 
     return createMacroConstant(impl, macro, name, DC, resultSwiftType,
                                clang::APValue(resultValue),
-                               ConstantConvertKind::Coerce,
+                               ConstantConvertKind::None,
                                /*isStatic=*/false, ClangN);
   }
   case 4: {

lib/ClangImporter/ImporterImpl.h

@@ -86,15 +86,12 @@ class ValueDecl;
 enum class ConstantConvertKind {
   /// No conversion required.
   None,
-  /// Coerce the constant to the given type.
-  Coerce,
-  /// Construct the given type from the constant value.
+  /// Construct the given type from the constant value by calling
+  /// init(rawValue:).
   Construction,
-  /// Construct the given type from the constant value, using an
-  /// optional initializer.
-  ConstructionWithUnwrap,
-  /// Perform an unchecked downcast to the given type.
-  Downcast
+  /// Construct the given type from the constant value by force
+  /// unwrapping the result of init(rawValue:).
+  ConstructionWithUnwrap
 };
 
 /// Describes the kind of type import we're performing.