---

yaml
---
r: 340823
b: refs/heads/rxwei-patch-1
c: 375e212
h: refs/heads/master
i:
  340821: 081743b
  340819: cf0fbe1
  340815: a5b0541

Author: David Ungar

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: c58481fc1cd54a60649119e36ef233502ddcf8fb
+refs/heads/rxwei-patch-1: 375e21232fc6c059ac6a730f2e466a0a82590430
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/cmake/modules/AddSwift.cmake

@@ -2346,17 +2346,6 @@ function(_add_swift_executable_single name)
   target_link_libraries("${name}" PRIVATE ${SWIFTEXE_SINGLE_LINK_LIBRARIES})
   swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_LLVM_LINK_COMPONENTS})
 
-  # NOTE(compnerd) use the C linker language to invoke `clang` rather than
-  # `clang++` as we explicitly link against the C++ runtime.  We were previously
-  # actually passing `-nostdlib++` to avoid the C++ runtime linkage.
-  if(SWIFTEXE_SINGLE_SDK STREQUAL ANDROID)
-    set_property(TARGET "${name}" PROPERTY
-      LINKER_LANGUAGE "C")
-  else()
-    set_property(TARGET "${name}" PROPERTY
-      LINKER_LANGUAGE "CXX")
-  endif()
-
   set_target_properties(${name} PROPERTIES FOLDER "Swift executables")
 endfunction()
 

branches/rxwei-patch-1/include/swift/AST/Attr.def

@@ -396,7 +396,7 @@ SIMPLE_DECL_ATTR(_alwaysEmitIntoClient, AlwaysEmitIntoClient,
   83)
 
 SIMPLE_DECL_ATTR(_implementationOnly, ImplementationOnly,
-  OnImport | OnFunc | OnConstructor | OnVar | OnSubscript | UserInaccessible,
+  OnImport | UserInaccessible,
   84)
 DECL_ATTR(_custom, Custom,
   OnAnyDecl | UserInaccessible,

branches/rxwei-patch-1/include/swift/AST/Decl.h

@@ -2700,20 +2700,7 @@ class ValueDecl : public Decl {
   /// True if this is a C function that was imported as a member of a type in
   /// Swift.
   bool isImportAsMember() const;
-
-  /// Returns true if the declaration's interface type is a function type with a
-  /// curried self parameter.
-  bool hasCurriedSelf() const;
-
-  /// Returns true if the declaration has a parameter list associated with it.
-  ///
-  /// Note that not all declarations with function interface types have
-  /// parameter lists, for example an enum element without associated values.
-  bool hasParameterList() const;
-
-  /// Returns the number of curry levels in the declaration's interface type.
-  unsigned getNumCurryLevels() const;
-
+  
   /// Get the decl for this value's opaque result type, if it has one.
   OpaqueTypeDecl *getOpaqueResultTypeDecl() const;
 
@@ -7202,29 +7189,6 @@ inline bool ValueDecl::isImportAsMember() const {
   return false;
 }
 
-inline bool ValueDecl::hasCurriedSelf() const {
-  if (auto *afd = dyn_cast<AbstractFunctionDecl>(this))
-    return afd->hasImplicitSelfDecl();
-  if (isa<EnumElementDecl>(this))
-    return true;
-  return false;
-}
-
-inline bool ValueDecl::hasParameterList() const {
-  if (auto *eed = dyn_cast<EnumElementDecl>(this))
-    return eed->hasAssociatedValues();
-  return isa<AbstractFunctionDecl>(this) || isa<SubscriptDecl>(this);
-}
-
-inline unsigned ValueDecl::getNumCurryLevels() const {
-  unsigned curryLevels = 0;
-  if (hasParameterList())
-    curryLevels++;
-  if (hasCurriedSelf())
-    curryLevels++;
-  return curryLevels;
-}
-
 inline bool Decl::isPotentiallyOverridable() const {
   if (isa<VarDecl>(this) ||
       isa<SubscriptDecl>(this) ||
@@ -7289,7 +7253,7 @@ inline EnumElementDecl *EnumDecl::getUniqueElement(bool hasValue) const {
 }
 
 /// Retrieve parameter declaration from the given source at given index.
-const ParamDecl *getParameterAt(const ValueDecl *source, unsigned index);
+const ParamDecl *getParameterAt(ValueDecl *source, unsigned index);
 
 /// Display Decl subclasses.
 void simple_display(llvm::raw_ostream &out, const Decl *decl);

branches/rxwei-patch-1/include/swift/AST/DiagnosticsClangImporter.def

@@ -17,8 +17,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if !(defined(DIAG) || (defined(ERROR) && defined(WARNING) && defined(NOTE) && defined(REMARK)))
-#  error Must define either DIAG or the set {ERROR,WARNING,NOTE,REMARK}
+#if !(defined(DIAG) || (defined(ERROR) && defined(WARNING) && defined(NOTE)))
+#  error Must define either DIAG or the set {ERROR,WARNING,NOTE}
 #endif
 
 #ifndef ERROR
@@ -36,19 +36,12 @@
   DIAG(NOTE,ID,Options,Text,Signature)
 #endif
 
-#ifndef REMARK
-#  define REMARK(ID,Options,Text,Signature) \
-  DIAG(REMARK,ID,Options,Text,Signature)
-#endif
-
 WARNING(warning_from_clang,none,
   "%0", (StringRef))
 ERROR(error_from_clang,none,
   "%0", (StringRef))
 NOTE(note_from_clang,none,
   "%0", (StringRef))
-REMARK(remark_from_clang,none,
-  "%0", (StringRef))
 
 ERROR(clang_cannot_build_module,Fatal,
   "could not build %select{C|Objective-C}0 module '%1'", (bool, StringRef))

branches/rxwei-patch-1/include/swift/AST/DiagnosticsSema.def

@@ -2490,18 +2490,6 @@ WARNING(warn_implementation_only_conflict,none,
 NOTE(implementation_only_conflict_here,none,
      "imported as implementation-only here", ())
 
-ERROR(implementation_only_decl_non_override,none,
-      "'@_implementationOnly' can only be used on overrides", ())
-ERROR(implementation_only_override_changed_type,none,
-      "'@_implementationOnly' override must have the same type as the "
-      "declaration it overrides (%0)", (Type))
-ERROR(implementation_only_override_without_attr,none,
-      "override of '@_implementationOnly' %0 should also be declared "
-      "'@_implementationOnly'", (DescriptiveDeclKind))
-ERROR(implementation_only_override_import_without_attr,none,
-      "override of %0 imported as implementation-only must be declared "
-      "'@_implementationOnly'", (DescriptiveDeclKind))
-
 // Derived conformances
 ERROR(cannot_synthesize_init_in_extension_of_nonfinal,none,
       "implementation of %0 for non-final class cannot be automatically "
@@ -3655,10 +3643,6 @@ ERROR(unsupported_opaque_type,none,
 ERROR(opaque_type_unsupported_pattern,none,
       "'some' type can only be declared on a single property declaration", ())
 
-ERROR(opaque_type_in_protocol_requirement,none,
-      "'some' type cannot be the return type of a protocol requirement; did you mean to add an associated type?",
-      ())
-
 // SIL
 ERROR(opened_non_protocol,none,
       "@opened cannot be applied to non-protocol type %0", (Type))

branches/rxwei-patch-1/lib/AST/ASTPrinter.cpp

@@ -126,10 +126,6 @@ PrintOptions PrintOptions::printParseableInterfaceFile(bool preferTypeRepr) {
 
   class ShouldPrintForParseableInterface : public ShouldPrintChecker {
     bool shouldPrint(const Decl *D, const PrintOptions &options) override {
-      // Skip anything that is marked `@_implementationOnly` itself.
-      if (D->getAttrs().hasAttribute<ImplementationOnlyAttr>())
-        return false;
-
       // Skip anything that isn't 'public' or '@usableFromInline'.
       if (auto *VD = dyn_cast<ValueDecl>(D)) {
         if (!isPublicOrUsableFromInline(VD)) {

branches/rxwei-patch-1/lib/AST/Decl.cpp

@@ -2400,7 +2400,7 @@ CanType ValueDecl::getOverloadSignatureType() const {
                            /*topLevelFunction=*/true,
                            isMethod,
                            /*isInitializer=*/isa<ConstructorDecl>(afd),
-                           getNumCurryLevels())->getCanonicalType();
+                           isMethod ? 2 : 1)->getCanonicalType();
   }
 
   if (isa<AbstractStorageDecl>(this)) {
@@ -2416,7 +2416,7 @@ CanType ValueDecl::getOverloadSignatureType() const {
           /*topLevelFunction=*/true,
           /*isMethod=*/false,
           /*isInitializer=*/false,
-          getNumCurryLevels())->getCanonicalType();
+          1)->getCanonicalType();
     }
 
     // We want to curry the default signature type with the 'self' type of the
@@ -2430,7 +2430,7 @@ CanType ValueDecl::getOverloadSignatureType() const {
   if (isa<EnumElementDecl>(this)) {
     auto mappedType = mapSignatureFunctionType(
         getASTContext(), getInterfaceType(), /*topLevelFunction=*/false,
-        /*isMethod=*/false, /*isInitializer=*/false, getNumCurryLevels());
+        /*isMethod=*/false, /*isInitializer=*/false, /*curryLevels=*/0);
     return mappedType->getCanonicalType();
   }
 
@@ -6108,7 +6108,7 @@ DeclName AbstractFunctionDecl::getEffectiveFullName() const {
   return DeclName();
 }
 
-const ParamDecl *swift::getParameterAt(const ValueDecl *source, unsigned index) {
+const ParamDecl *swift::getParameterAt(ValueDecl *source, unsigned index) {
   const ParameterList *paramList;
   if (auto *AFD = dyn_cast<AbstractFunctionDecl>(source)) {
     paramList = AFD->getParameters();

branches/rxwei-patch-1/lib/AST/DeclContext.cpp

@@ -317,8 +317,14 @@ ResilienceExpansion DeclContext::getResilienceExpansion() const {
     if (isa<DefaultArgumentInitializer>(dc)) {
       dc = dc->getParent();
 
-      auto *VD = cast<ValueDecl>(dc->getAsDecl());
-      assert(VD->hasParameterList());
+      const ValueDecl *VD;
+      if (auto *FD = dyn_cast<AbstractFunctionDecl>(dc)) {
+        VD = FD;
+      } else if (auto *EED = dyn_cast<EnumElementDecl>(dc)) {
+        VD = EED;
+      } else {
+        VD = cast<SubscriptDecl>(dc);
+      }
 
       auto access =
         VD->getFormalAccessScope(/*useDC=*/nullptr,

branches/rxwei-patch-1/lib/AST/Type.cpp

@@ -743,26 +743,26 @@ ParameterListInfo::ParameterListInfo(
   if (!paramOwner)
     return;
 
-  // If the decl has a curried self, but we're not allowed to skip it, return.
-  if (paramOwner->hasCurriedSelf() && !skipCurriedSelf)
-    return;
-
   // Find the corresponding parameter list.
   const ParameterList *paramList = nullptr;
   if (auto *func = dyn_cast<AbstractFunctionDecl>(paramOwner)) {
-    paramList = func->getParameters();
+    if (func->hasImplicitSelfDecl()) {
+      if (skipCurriedSelf)
+        paramList = func->getParameters();
+    } else if (!skipCurriedSelf)
+      paramList = func->getParameters();
   } else if (auto *subscript = dyn_cast<SubscriptDecl>(paramOwner)) {
-    paramList = subscript->getIndices();
+    if (skipCurriedSelf)
+      paramList = subscript->getIndices();
   } else if (auto *enumElement = dyn_cast<EnumElementDecl>(paramOwner)) {
-    paramList = enumElement->getParameterList();
+    if (skipCurriedSelf)
+      paramList = enumElement->getParameterList();
   }
 
   // No parameter list means no default arguments - hand back the zeroed
   // bitvector.
-  if (!paramList) {
-    assert(!paramOwner->hasParameterList());
+  if (!paramList)
     return;
-  }
 
   switch (params.size()) {
   case 0:

branches/rxwei-patch-1/lib/AST/UnqualifiedLookup.cpp

@@ -504,7 +504,7 @@ void UnqualifiedLookupFactory::performUnqualifiedLookup() {
 void UnqualifiedLookupFactory::lookUpTopLevelNamesInModuleScopeContext(
     DeclContext *DC) {
   // TODO: Does the debugger client care about compound names?
-  if (Name.isSimpleName() && DebugClient &&
+  if (Name.isSimpleName() && !Name.isSpecial() && DebugClient &&
       DebugClient->lookupOverrides(Name.getBaseName(), DC, Loc,
                                    isOriginallyTypeLookup, Results))
     return;

branches/rxwei-patch-1/lib/ClangImporter/ClangDiagnosticConsumer.cpp

@@ -227,8 +227,8 @@ void ClangDiagnosticConsumer::HandleDiagnostic(
       diagKind = diag::note_from_clang;
       break;
     case clang::DiagnosticsEngine::Remark:
-      diagKind = diag::remark_from_clang;
-      break;
+      // FIXME: We don't handle remarks yet.
+      return;
     case clang::DiagnosticsEngine::Warning:
       diagKind = diag::warning_from_clang;
       break;

branches/rxwei-patch-1/lib/IDE/CodeCompletion.cpp

@@ -1464,7 +1464,7 @@ protocolForLiteralKind(CodeCompletionLiteralKind kind) {
 static bool hasTrivialTrailingClosure(const FuncDecl *FD,
                                       AnyFunctionType *funcType) {
   ParameterListInfo paramInfo(funcType->getParams(), FD,
-                              /*skipCurriedSelf*/ FD->hasCurriedSelf());
+                              /*level*/ FD->isInstanceMember() ? 1 : 0);
 
   if (paramInfo.size() - paramInfo.numNonDefaultedParameters() == 1) {
     auto param = funcType->getParams().back();

branches/rxwei-patch-1/lib/ParseSIL/ParseSIL.cpp

@@ -2028,9 +2028,18 @@ bool SILParser::parseSILDeclRef(SILDeclRef &Member, bool FnTypeRequired) {
     for (unsigned I = 0, E = values.size(); I < E; I++) {
       auto *decl = values[I];
 
+      unsigned numArgumentLabels = 0;
+      if (auto *eed = dyn_cast<EnumElementDecl>(decl)) {
+        numArgumentLabels =
+          (eed->hasAssociatedValues() ? 2 : 1);
+      } else if (auto *afd = dyn_cast<AbstractFunctionDecl>(decl)) {
+        numArgumentLabels =
+          (decl->getDeclContext()->isTypeContext() ? 2 : 1);
+      }
+
       auto lookupTy =
         decl->getInterfaceType()
-            ->removeArgumentLabels(decl->getNumCurryLevels());
+            ->removeArgumentLabels(numArgumentLabels);
       if (declTy == lookupTy->getCanonicalType()) {
         TheDecl = decl;
         // Update SILDeclRef to point to the right Decl.

branches/rxwei-patch-1/lib/PrintAsObjC/PrintAsObjC.cpp

@@ -204,8 +204,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
   }
 
   bool shouldInclude(const ValueDecl *VD) {
-    return isVisibleToObjC(VD, minRequiredAccess) &&
-           !VD->getAttrs().hasAttribute<ImplementationOnlyAttr>();
+    return isVisibleToObjC(VD, minRequiredAccess);
   }
 
 private:

branches/rxwei-patch-1/lib/SIL/SILDeclRef.cpp

@@ -1018,10 +1018,10 @@ unsigned SILDeclRef::getParameterListCount() const {
 
   auto *vd = getDecl();
 
-  if (isa<AbstractFunctionDecl>(vd) || isa<EnumElementDecl>(vd)) {
-    // For functions and enum elements, the number of parameter lists is the
-    // same as in their interface type.
-    return vd->getNumCurryLevels();
+  if (auto *func = dyn_cast<AbstractFunctionDecl>(vd)) {
+    return func->hasImplicitSelfDecl() ? 2 : 1;
+  } else if (auto *ed = dyn_cast<EnumElementDecl>(vd)) {
+    return ed->hasAssociatedValues() ? 2 : 1;
   } else if (isa<ClassDecl>(vd)) {
     return 2;
   } else if (isa<VarDecl>(vd)) {

branches/rxwei-patch-1/lib/Sema/CSDiag.cpp

@@ -2663,7 +2663,8 @@ typeCheckArgumentChildIndependently(Expr *argExpr, Type argType,
     // default arguments.
     ParameterListInfo paramInfo;
     if (!candidates.empty()) {
-      paramInfo = candidates[0].getParameterListInfo(params);
+      paramInfo = ParameterListInfo(params, candidates[0].getDecl(),
+                                    candidates[0].skipCurriedSelf);
     } else {
       paramInfo = ParameterListInfo(params, nullptr, /*skipCurriedSelf=*/false);
     }
@@ -3549,7 +3550,8 @@ diagnoseSingleCandidateFailures(CalleeCandidateInfo &CCI, Expr *fnExpr,
     return false;
 
   auto params = candidate.getParameters();
-  auto paramInfo = candidate.getParameterListInfo(params);
+  ParameterListInfo paramInfo(params, candidate.getDecl(),
+                              candidate.skipCurriedSelf);
   auto args = decomposeArgType(CCI.CS.getType(argExpr), argLabels);
 
   // Check the case where a raw-representable type is constructed from an
@@ -4196,7 +4198,8 @@ bool FailureDiagnosis::diagnoseArgumentGenericRequirements(
     return false;
 
   auto params = candidate.getParameters();
-  auto paramInfo = candidate.getParameterListInfo(params);
+  ParameterListInfo paramInfo(params, candidate.getDecl(),
+                              candidate.skipCurriedSelf);
   auto args = decomposeArgType(CS.getType(argExpr), argLabels);
 
   SmallVector<ParamBinding, 4> bindings;
@@ -4669,7 +4672,7 @@ static bool isViableOverloadSet(const CalleeCandidateInfo &CCI,
       return true;
     };
 
-    auto paramInfo = cand.getParameterListInfo(params);
+    ParameterListInfo paramInfo(params, funcDecl, cand.skipCurriedSelf);
     InputMatcher IM(params, paramInfo);
     auto result = IM.match(numArgs, pairMatcher);
     if (result == InputMatcher::IM_Succeeded)