Merge branch 'master' into patch-1

Author: milseman

include/swift/AST/Decl.h

@@ -4729,10 +4729,6 @@ class ParamDecl : public VarDecl {
   /// was specified separately from the parameter name.
   SourceLoc getArgumentNameLoc() const { return ArgumentNameLoc; }
 
-  /// Retrieve the parameter type flags corresponding to the declaration of
-  /// this parameter's argument type.
-  ParameterTypeFlags getParameterFlags() const;
-  
   SourceLoc getSpecifierLoc() const { return SpecifierLoc; }
 
   bool isTypeLocImplicit() const { return Bits.ParamDecl.IsTypeLocImplicit; }
@@ -4822,8 +4818,6 @@ class ParamDecl : public VarDecl {
 
 /// Describes the kind of subscripting used in Objective-C.
 enum class ObjCSubscriptKind {
-  /// Not an Objective-C subscripting kind.
-  None,
   /// Objective-C indexed subscripting, which is based on an integral
   /// index.
   Indexed,
@@ -5774,8 +5768,8 @@ class EnumElementDecl : public ValueDecl {
   }
 
   /// Set the interface type of this enum element to the constructor function
-  /// type; (Self) -> Result or (Self) -> (Args...) -> Result.
-  bool computeType();
+  /// type; (Self.Type) -> Self or (Self.Type) -> (Args...) -> Self.
+  void computeType();
 
   Type getArgumentInterfaceType() const;
 

include/swift/AST/DiagnosticsSema.def

@@ -1064,16 +1064,6 @@ ERROR(c_function_pointer_from_function_with_context,none,
 // MARK: Type Check Declarations
 //------------------------------------------------------------------------------
 
-ERROR(var_type_not_materializable,none,
-      "variable has type %0 which includes nested inout parameters",
-      (Type))
-ERROR(param_type_non_materializable_tuple,none,
-      "named parameter has type %0 which includes nested inout parameters",
-      (Type))
-ERROR(enum_element_not_materializable,none,
-      "enum case has type %0 which includes nested inout parameters",
-      (Type))
-
 ERROR(missing_initializer_def,PointsToFirstBadToken,
       "initializer requires a body", ())
 
@@ -3614,9 +3604,6 @@ WARNING(attribute_meaningless_when_nonobjc,none,
 ERROR(objc_invalid_on_var,none,
       "property cannot be %" OBJC_ATTR_SELECT "0 "
       "because its type cannot be represented in Objective-C", (unsigned))
-ERROR(objc_invalid_subscript_key_type,none,
-      "subscript cannot be %" OBJC_ATTR_SELECT "0 because its key "
-      "type %1 is neither an integer nor an object", (unsigned, Type))
 ERROR(objc_invalid_on_subscript,none,
       "subscript cannot be %" OBJC_ATTR_SELECT "0 because its type "
       "cannot be represented in Objective-C", (unsigned))

include/swift/AST/ParameterList.h

@@ -123,23 +123,14 @@ class alignas(ParamDecl *) ParameterList final :
   ParameterList *clone(const ASTContext &C,
                        OptionSet<CloneFlags> options = None) const;
 
-  /// Return a TupleType or ParenType for this parameter list,
-  /// based on types provided by a callback.
-  Type getType(const ASTContext &C,
-               llvm::function_ref<Type(ParamDecl *)> getType) const;
-
-  /// Return a TupleType or ParenType for this parameter list, written in terms
-  /// of contextual archetypes.
-  Type getType(const ASTContext &C) const;
+  /// Return a list of function parameters for this parameter list,
+  /// based on the interface types of the parameters in this list.
+  void getParams(SmallVectorImpl<AnyFunctionType::Param> &params) const;
 
-  /// Return a TupleType or ParenType for this parameter list, written in terms
-  /// of interface types.
-  Type getInterfaceType(const ASTContext &C) const;
-
-  /// Return the full function type for a set of curried parameter lists that
-  /// returns the specified result type written in terms of interface types.
-  static Type getFullInterfaceType(Type resultType, ArrayRef<ParameterList*> PL,
-                                   const ASTContext &C);
+  /// Return a list of function parameters for this parameter list,
+  /// based on types provided by a callback.
+  void getParams(SmallVectorImpl<AnyFunctionType::Param> &params,
+                 llvm::function_ref<Type(ParamDecl *)> getType) const;
 
 
   /// Return the full source range of this parameter.

include/swift/Parse/CodeCompletionCallbacks.h

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// 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
@@ -187,12 +187,12 @@ class CodeCompletionCallbacks {
   virtual void completePoundAvailablePlatform() = 0;
 
   /// Complete the import decl with importable modules.
-  virtual void completeImportDecl(std::vector<std::pair<Identifier, SourceLoc>> &Path) = 0;
+  virtual void
+  completeImportDecl(std::vector<std::pair<Identifier, SourceLoc>> &Path) = 0;
 
   /// Complete unresolved members after dot.
-  virtual void completeUnresolvedMember(UnresolvedMemberExpr *E,
-                                        ArrayRef<StringRef> Identifiers,
-                                        bool HasReturn) = 0;
+  virtual void completeUnresolvedMember(CodeCompletionExpr *E,
+                                        SourceLoc DotLoc) = 0;
 
   virtual void completeAssignmentRHS(AssignExpr *E) = 0;
 
@@ -232,4 +232,3 @@ class CodeCompletionCallbacksFactory {
 } // namespace swift
 
 #endif // LLVM_SWIFT_PARSE_CODE_COMPLETION_CALLBACKS_H
-

include/swift/Sema/IDETypeChecking.h

@@ -52,12 +52,6 @@ namespace swift {
   void collectDefaultImplementationForProtocolMembers(ProtocolDecl *PD,
                         llvm::SmallDenseMap<ValueDecl*, ValueDecl*> &DefaultMap);
 
-  /// \brief Given an unresolved member E and its parent P, this function tries
-  /// to infer the type of E.
-  /// \returns true on success, false on error.
-  bool typeCheckUnresolvedExpr(DeclContext &DC, Expr* E,
-                               Expr *P, SmallVectorImpl<Type> &PossibleTypes);
-
   enum InterestedMemberKind : uint8_t {
     Viable,
     Unviable,

include/swift/Serialization/ModuleFile.h

@@ -506,8 +506,7 @@ class ModuleFile
 
   /// Main logic of getDeclChecked.
   llvm::Expected<Decl *>
-  getDeclCheckedImpl(serialization::DeclID DID,
-                     Optional<DeclContext *> ForcedContext = None);
+  getDeclCheckedImpl(serialization::DeclID DID);
 
   /// Reads the index block, which contains global tables.
   ///
@@ -796,23 +795,15 @@ class ModuleFile
   /// Returns the decl with the given ID, deserializing it if needed.
   ///
   /// \param DID The ID for the decl within this module.
-  /// \param ForcedContext Optional override for the decl context of certain
-  ///                      kinds of decls, used to avoid re-entrant
-  ///                      deserialization.
-  ///
+
   /// \sa getDeclChecked
-  Decl *getDecl(serialization::DeclID DID,
-                Optional<DeclContext *> ForcedContext = None);
+  Decl *getDecl(serialization::DeclID DID);
 
   /// Returns the decl with the given ID, deserializing it if needed.
   ///
   /// \param DID The ID for the decl within this module.
-  /// \param ForcedContext Optional override for the decl context of certain
-  ///                      kinds of decls, used to avoid re-entrant
-  ///                      deserialization.
   llvm::Expected<Decl *>
-  getDeclChecked(serialization::DeclID DID,
-                 Optional<DeclContext *> ForcedContext = None);
+  getDeclChecked(serialization::DeclID DID);
 
   /// Returns the decl context with the given ID, deserializing it if needed.
   DeclContext *getDeclContext(serialization::DeclContextID DID);

include/swift/Serialization/ModuleFormat.h

@@ -55,7 +55,7 @@ const uint16_t VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t VERSION_MINOR = 432; // Last change: default argument text
+const uint16_t VERSION_MINOR = 433; // Last change: GenericTypeParamDecl doesn't need a DC
 
 using DeclIDField = BCFixed<31>;
 
@@ -871,7 +871,6 @@ namespace decls_block {
   using GenericTypeParamDeclLayout = BCRecordLayout<
     GENERIC_TYPE_PARAM_DECL,
     IdentifierIDField,  // name
-    DeclContextIDField, // context decl
     BCFixed<1>,         // implicit flag
     BCVBR<4>,           // depth
     BCVBR<4>            // index

lib/AST/Decl.cpp

@@ -4332,8 +4332,6 @@ AbstractStorageDecl::getObjCGetterSelector(Identifier preferredName) const {
   auto &ctx = getASTContext();
   if (auto *SD = dyn_cast<SubscriptDecl>(this)) {
     switch (SD->getObjCSubscriptKind()) {
-    case ObjCSubscriptKind::None:
-      llvm_unreachable("Not an Objective-C subscript");
     case ObjCSubscriptKind::Indexed:
       return ObjCSelector(ctx, 1, ctx.Id_objectAtIndexedSubscript);
     case ObjCSubscriptKind::Keyed:
@@ -4365,9 +4363,6 @@ AbstractStorageDecl::getObjCSetterSelector(Identifier preferredName) const {
   auto &ctx = getASTContext();
   if (auto *SD = dyn_cast<SubscriptDecl>(this)) {
     switch (SD->getObjCSubscriptKind()) {
-    case ObjCSubscriptKind::None:
-      llvm_unreachable("Not an Objective-C subscript");
-
     case ObjCSubscriptKind::Indexed:
       return ObjCSelector(ctx, 2,
                           { ctx.Id_setObject, ctx.Id_atIndexedSubscript });
@@ -4804,11 +4799,6 @@ ParamDecl *ParamDecl::createSelf(SourceLoc loc, DeclContext *DC,
   return selfDecl;
 }
 
-ParameterTypeFlags ParamDecl::getParameterFlags() const {
-  return ParameterTypeFlags::fromParameterType(getType(), isVariadic(),
-                                               getValueOwnership());
-}
-
 /// Return the full source range of this parameter.
 SourceRange ParamDecl::getSourceRange() const {
   SourceLoc APINameLoc = getArgumentNameLoc();
@@ -4974,17 +4964,18 @@ Type SubscriptDecl::getElementInterfaceType() const {
 }
 
 void SubscriptDecl::computeType() {
-  auto &ctx = getASTContext();
-
   auto elementTy = getElementTypeLoc().getType();
-  auto indicesTy = getIndices()->getInterfaceType(ctx);
-  Type funcTy;
 
+  SmallVector<AnyFunctionType::Param, 2> argTy;
+  getIndices()->getParams(argTy);
+
+  Type funcTy;
   if (auto *sig = getGenericSignature())
-    funcTy = GenericFunctionType::get(sig, indicesTy, elementTy,
+    funcTy = GenericFunctionType::get(sig, argTy, elementTy,
                                       AnyFunctionType::ExtInfo());
   else
-    funcTy = FunctionType::get(indicesTy, elementTy);
+    funcTy = FunctionType::get(argTy, elementTy,
+                               AnyFunctionType::ExtInfo());
 
   // Record the interface type.
   setInterfaceType(funcTy);
@@ -5408,8 +5399,7 @@ void AbstractFunctionDecl::computeType(AnyFunctionType::ExtInfo info) {
 
   {
     SmallVector<AnyFunctionType::Param, 4> argTy;
-    AnyFunctionType::decomposeInput(
-      getParameters()->getInterfaceType(ctx), argTy);
+    getParameters()->getParams(argTy);
 
     // 'throws' only applies to the innermost function.
     info = info.withThrows(hasThrows());
@@ -5729,30 +5719,38 @@ SourceRange EnumElementDecl::getSourceRange() const {
   return {getStartLoc(), getNameLoc()};
 }
 
-bool EnumElementDecl::computeType() {
+void EnumElementDecl::computeType() {
   assert(!hasInterfaceType());
 
-  EnumDecl *ED = getParentEnum();
-  Type resultTy = ED->getDeclaredInterfaceType();
+  auto &ctx = getASTContext();
+  auto *ED = getParentEnum();
+
+  // The type of the enum element is either (Self.Type) -> Self
+  // or (Self.Type) -> (Args...) -> Self.
+  auto resultTy = ED->getDeclaredInterfaceType();
 
-  Type selfTy = MetatypeType::get(resultTy);
+  SmallVector<AnyFunctionType::Param, 1> selfTy;
+  selfTy.emplace_back(MetatypeType::get(resultTy, ctx),
+                      Identifier(),
+                      ParameterTypeFlags());
 
-  // The type of the enum element is either (T) -> T or (T) -> ArgType -> T.
   if (auto *PL = getParameterList()) {
-    auto paramTy = PL->getInterfaceType(getASTContext());
-    resultTy = FunctionType::get(paramTy, resultTy);
+    SmallVector<AnyFunctionType::Param, 4> argTy;
+    PL->getParams(argTy);
+
+    resultTy = FunctionType::get(argTy, resultTy,
+                                 AnyFunctionType::ExtInfo());
   }
 
-  if (auto *genericSig = ED->getGenericSignatureOfContext())
+  if (auto *genericSig = ED->getGenericSignature())
     resultTy = GenericFunctionType::get(genericSig, selfTy, resultTy,
                                         AnyFunctionType::ExtInfo());
   else
-    resultTy = FunctionType::get(selfTy, resultTy);
+    resultTy = FunctionType::get(selfTy, resultTy,
+                                 AnyFunctionType::ExtInfo());
 
   // Record the interface type.
   setInterfaceType(resultTy);
-
-  return true;
 }
 
 Type EnumElementDecl::getArgumentInterfaceType() const {

lib/AST/Parameter.cpp

@@ -87,56 +87,29 @@ ParameterList *ParameterList::clone(const ASTContext &C,
   return create(C, params);
 }
 
-/// Return a TupleType or ParenType for this parameter list,
-/// based on types provided by a callback.
-Type ParameterList::getType(
-    const ASTContext &C, llvm::function_ref<Type(ParamDecl *)> getType) const {
-  if (size() == 0)
-    return TupleType::getEmpty(C);
+void ParameterList::getParams(
+                        SmallVectorImpl<AnyFunctionType::Param> &params) const {
+  getParams(params,
+            [](ParamDecl *decl) { return decl->getInterfaceType(); });
+}
 
-  SmallVector<TupleTypeElt, 8> argumentInfo;
+void ParameterList::getParams(
+                          SmallVectorImpl<AnyFunctionType::Param> &params,
+                          llvm::function_ref<Type(ParamDecl *)> getType) const {
+  if (size() == 0)
+    return;
 
   for (auto P : *this) {
     auto type = getType(P);
-    argumentInfo.emplace_back(
-        type->getInOutObjectType(), P->getArgumentName(),
-        ParameterTypeFlags::fromParameterType(type, P->isVariadic(),
-                                              P->getValueOwnership()));
-  }
-
-  return TupleType::get(argumentInfo, C);
-}
-
-/// Return a TupleType or ParenType for this parameter list, written in terms
-/// of contextual archetypes.
-Type ParameterList::getType(const ASTContext &C) const {
-  return getType(C, [](ParamDecl *P) { return P->getType(); });
-}
-
-/// Return a TupleType or ParenType for this parameter list, written in terms
-/// of interface types.
-Type ParameterList::getInterfaceType(const ASTContext &C) const {
-  return getType(C, [](ParamDecl *P) {
-    auto type = P->getInterfaceType();
-    assert(!type->hasArchetype());
-    return type;
-  });
-}
 
+    if (P->isVariadic())
+      type = ParamDecl::getVarargBaseTy(type);
 
-/// Return the full function type for a set of curried parameter lists that
-/// returns the specified result type.  This returns a null type if one of the
-/// ParamDecls does not have a type set for it yet.
-///
-Type ParameterList::getFullInterfaceType(Type resultType,
-                                         ArrayRef<ParameterList*> PLL,
-                                         const ASTContext &C) {
-  auto result = resultType;
-  for (auto PL : reversed(PLL)) {
-    auto paramType = PL->getInterfaceType(C);
-    result = FunctionType::get(paramType, result);
+    auto label = P->getArgumentName();
+    auto flags = ParameterTypeFlags::fromParameterType(type, P->isVariadic(),
+                                                       P->getValueOwnership());
+    params.emplace_back(type, label, flags);
   }
-  return result;
 }
 
 

lib/ClangImporter/ClangAdapter.h

@@ -19,7 +19,6 @@
 #define CLANG_ADAPTER_H
 
 #include "swift/Basic/StringExtras.h"
-#include "swift/Serialization/ModuleFormat.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallBitVector.h"
 #include "clang/Basic/Specifiers.h"