Remove 4 constraint solver fixits that were not pulling their weight anymore:

- 3 related to OptionSet migration for Swift 1 -> Swift 2.
- 1 related to calling a non-function type, which is now handled by CSDiags.

Author: lattner

include/swift/AST/DiagnosticsSema.def

@@ -672,9 +672,6 @@ ERROR(extra_address_of_unsafepointer,none,
 ERROR(missing_init_on_metatype_initialization,none,
       "initializing from a metatype value must reference 'init' explicitly",
       ())
-ERROR(extra_call_nonfunction,none,
-      "invalid use of '()' to call a value of non-function type %0",
-      (Type))
 ERROR(extra_argument_labels,none,
       "extraneous argument label%select{|s}0 '%1' in %select{call|subscript}2",
       (bool, StringRef, bool))
@@ -1802,16 +1799,6 @@ ERROR(optional_used_as_true_boolean,none,
       "optional type %0 cannot be used as a boolean; "
       "test for '== nil' instead", (Type))
 
-ERROR(migrate_from_raw_to_init,none,
-      "static method 'fromRaw' has been replaced with a failable initializer "
-      "'init(rawValue:)'", ())
-ERROR(migrate_from_allZeros,none,
-      "static method 'allZeros' has been replaced with the default initializer",
-      ())
-
-ERROR(migrate_to_raw_to_raw_value,none,
-      "method 'fromRaw' has been replaced with a property 'rawValue'", ())
-
 ERROR(interpolation_missing_proto,none,
       "string interpolation requires the protocol 'StringInterpolationConvertible' to be defined",
       ())

lib/Sema/CSApply.cpp

@@ -5888,24 +5888,9 @@ bool ConstraintSystem::applySolutionFix(Expr *expr,
                                         unsigned fixNo) {
   auto &fix = solution.Fixes[fixNo];
 
-  // Some fixes need more information from the locator itself, including
-  // tweaking the locator. Deal with those now.
+  // Some fixes need more information from the locator.
   ConstraintLocator *locator = fix.second;
 
-  // Removing a nullary call to a non-function requires us to have an
-  // 'ApplyFunction', which we strip.
-  if (fix.first.getKind() == FixKind::RemoveNullaryCall) {
-    auto anchor = locator->getAnchor();
-    auto path = locator->getPath();
-    if (!path.empty() &&
-        path.back().getKind() == ConstraintLocator::ApplyFunction) {
-      locator = getConstraintLocator(anchor, path.slice(0, path.size()-1),
-                                     locator->getSummaryFlags());
-    } else {
-      return false;
-    }
-  }
-
   // Resolve the locator to a specific expression.
   SourceRange range;
   ConstraintLocator *resolved = simplifyLocator(*this, locator, range);
@@ -5932,16 +5917,6 @@ bool ConstraintSystem::applySolutionFix(Expr *expr,
   case FixKind::None:
     llvm_unreachable("no-fix marker should never make it into solution");
 
-  case FixKind::RemoveNullaryCall:
-    if (auto apply = dyn_cast<ApplyExpr>(affected)) {
-      auto type = solution.simplifyType(TC, apply->getFn()->getType())
-                    ->getRValueObjectType();
-      TC.diagnose(affected->getLoc(), diag::extra_call_nonfunction, type)
-        .fixItRemove(apply->getArg()->getSourceRange());
-      return true;
-    }
-    return false;
-
   case FixKind::ForceOptional: {
     const Expr *unwrapped = affected->getValueProvidingExpr();
     auto type = solution.simplifyType(TC, affected->getType())
@@ -6085,117 +6060,6 @@ bool ConstraintSystem::applySolutionFix(Expr *expr,
     return true;
   }
 
-  case FixKind::FromRawToInit: {
-    // Chase the parent map to find the reference to 'fromRaw' and
-    // the call to it. We'll need these for the Fix-It.
-    UnresolvedDotExpr *fromRawRef = nullptr;
-    CallExpr *fromRawCall = nullptr;
-    auto parentMap = expr->getParentMap();
-    Expr *current = affected;
-    do {
-      if (!fromRawRef) {
-        // We haven't found the reference to fromRaw yet, look for it now.
-        fromRawRef = dyn_cast<UnresolvedDotExpr>(current);
-        if (fromRawRef && fromRawRef->getName() != TC.Context.Id_fromRaw)
-          fromRawRef = nullptr;
-
-        current = parentMap[current];
-        continue;
-      } 
-      
-      // We previously found the reference to fromRaw, so we're
-      // looking for the call.
-      fromRawCall = dyn_cast<CallExpr>(current);
-      if (fromRawCall)
-        break;
-      
-      current = parentMap[current];
-      continue;          
-    } while (current);
-
-    if (fromRawCall) {
-      TC.diagnose(fromRawRef->getNameLoc().getBaseNameLoc(), 
-                  diag::migrate_from_raw_to_init)
-        .fixItReplace(SourceRange(fromRawRef->getDotLoc(),
-                                  fromRawCall->getArg()->getStartLoc()),
-                      "(rawValue: ");
-    } else {
-      // Diagnostic without Fix-It; we couldn't find what we needed.
-      TC.diagnose(affected->getLoc(), diag::migrate_from_raw_to_init);
-    }
-    return true;
-  }
-
-  case FixKind::ToRawToRawValue: {
-    // Chase the parent map to find the reference to 'toRaw' and
-    // the call to it. We'll need these for the Fix-It.
-    UnresolvedDotExpr *toRawRef = nullptr;
-    CallExpr *toRawCall = nullptr;
-    auto parentMap = expr->getParentMap();
-    Expr *current = affected;
-    do {
-      if (!toRawRef) {
-        // We haven't found the reference to toRaw yet, look for it now.
-        toRawRef = dyn_cast<UnresolvedDotExpr>(current);
-        if (toRawRef && toRawRef->getName() != TC.Context.Id_toRaw)
-          toRawRef = nullptr;
-
-        current = parentMap[current];
-        continue;
-      } 
-      
-      // We previously found the reference to toRaw, so we're
-      // looking for the call.
-      toRawCall = dyn_cast<CallExpr>(current);
-      if (toRawCall)
-        break;
-      
-      current = parentMap[current];
-      continue;          
-    } while (current);
-
-    if (toRawCall) {
-      TC.diagnose(toRawRef->getNameLoc(),
-                  diag::migrate_to_raw_to_raw_value)
-        .fixItReplace(SourceRange(toRawRef->getNameLoc().getBaseNameLoc(),
-                                  toRawCall->getArg()->getEndLoc()),
-                      "rawValue");
-    } else {
-      TC.diagnose(affected->getLoc(), diag::migrate_to_raw_to_raw_value);
-    }
-    return true;
-  }
-  case FixKind::AllZerosToInit: {
-    // Chase the parent map to find the reference to 'allZeros' and
-    // the call to it. We'll need these for the Fix-It.
-    UnresolvedDotExpr *allZerosRef = nullptr;
-    auto parentMap = expr->getParentMap();
-    Expr *current = affected;
-    do {
-      // We haven't found the reference to allZeros yet, look for it now.
-      if ((allZerosRef = dyn_cast<UnresolvedDotExpr>(current))) {
-        if (allZerosRef->getName().isSimpleName(TC.Context.Id_allZeros))
-          break;
-        allZerosRef = nullptr;
-      }
-
-      current = parentMap[current];
-    } while (current);
-
-    if (allZerosRef) {
-      TC.diagnose(allZerosRef->getNameLoc(),
-                  diag::migrate_from_allZeros)
-        .fixItReplace(SourceRange(
-                        allZerosRef->getDotLoc(),
-                        allZerosRef->getNameLoc().getSourceRange().End),
-                      "()");
-    } else {
-      // Diagnostic without Fix-It; we couldn't find what we needed.
-      TC.diagnose(affected->getLoc(), diag::migrate_from_allZeros);
-    }
-    return true;
-  }
-
   case FixKind::CoerceToCheckedCast: {
     if (auto *coerceExpr = dyn_cast<CoerceExpr>(locator->getAnchor())) {
       Expr *subExpr = coerceExpr->getSubExpr();

lib/Sema/CSSimplify.cpp

@@ -2570,26 +2570,6 @@ ConstraintSystem::simplifyOptionalObjectConstraint(const Constraint &constraint)
   return SolutionKind::Solved;
 }
 
-/// If the given type conforms to the RawRepresentable protocol,
-/// return its underlying raw type.
-static Type getRawRepresentableValueType(TypeChecker &tc, DeclContext *dc, 
-                                         Type type) {
-  auto proto = tc.Context.getProtocol(KnownProtocolKind::RawRepresentable);
-  if (!proto)
-    return nullptr;
-
-  if (type->hasTypeVariable())
-    return nullptr;
-
-  ProtocolConformance *conformance = nullptr;
-  if (!tc.conformsToProtocol(type, proto, dc,
-                             ConformanceCheckFlags::InExpression, &conformance))
-    return nullptr;
-
-  return tc.getWitnessType(type, proto, conformance, tc.Context.Id_RawValue,
-                           diag::broken_raw_representable_requirement);
-}
-
 /// Retrieve the argument labels that are provided for a member
 /// reference at the given locator.
 static Optional<ArrayRef<Identifier>> 
@@ -3139,7 +3119,6 @@ ConstraintSystem::simplifyMemberConstraint(const Constraint &constraint) {
                         baseTy, constraint.getLocator(),
                         /*includeInaccessibleMembers*/false);
 
-  DeclName name = constraint.getMember();
   Type memberTy = constraint.getSecondType();
 
   switch (result.OverallResult) {
@@ -3193,62 +3172,6 @@ ConstraintSystem::simplifyMemberConstraint(const Constraint &constraint) {
     instanceTy = MTT->getInstanceType();
 
   // Value member lookup has some hacks too.
-  Type rawValueType;
-  if (shouldAttemptFixes() && name == TC.Context.Id_fromRaw &&
-      (rawValueType = getRawRepresentableValueType(TC, DC, instanceTy))) {
-    // Replace a reference to ".fromRaw" with a reference to init(rawValue:).
-    // FIXME: This is temporary.
-    
-    // Record this fix.
-    if (recordFix(FixKind::FromRawToInit, constraint.getLocator()))
-      return SolutionKind::Error;
-      
-    // Form the type that "fromRaw" would have had and bind the
-    // member type to it.
-    Type fromRawType = FunctionType::get(ParenType::get(TC.Context,
-                                                        rawValueType),
-                                         OptionalType::get(instanceTy));
-    addConstraint(ConstraintKind::Bind, memberTy, fromRawType,
-                  constraint.getLocator());
-    
-    return SolutionKind::Solved;
-  }
-  
-  if (shouldAttemptFixes() && name == TC.Context.Id_toRaw &&
-      (rawValueType = getRawRepresentableValueType(TC, DC, instanceTy))) {
-    // Replace a call to "toRaw" with a reference to rawValue.
-    // FIXME: This is temporary.
-    
-    // Record this fix.
-    if (recordFix(FixKind::ToRawToRawValue, constraint.getLocator()))
-      return SolutionKind::Error;
-    
-    // Form the type that "toRaw" would have had and bind the member
-    // type to it.
-    Type toRawType = FunctionType::get(TupleType::getEmpty(TC.Context),
-                                       rawValueType);
-    addConstraint(ConstraintKind::Bind, memberTy, toRawType,
-                  constraint.getLocator());
-    
-    return SolutionKind::Solved;
-  }
-  
-  if (shouldAttemptFixes() && name.isSimpleName(getASTContext().Id_allZeros) &&
-      (rawValueType = getRawRepresentableValueType(TC, DC, instanceTy))) {
-    // Replace a reference to "X.allZeros" with a reference to X().
-    // FIXME: This is temporary.
-    
-    // Record this fix.
-    if (recordFix(FixKind::AllZerosToInit, constraint.getLocator()))
-      return SolutionKind::Error;
-    
-    // Form the type that "allZeros" would have had and bind the
-    // member type to it.
-    addConstraint(ConstraintKind::Bind, memberTy, rawValueType,
-                  constraint.getLocator());
-    return SolutionKind::Solved;
-  }
-  
   if (shouldAttemptFixes() && baseObjTy->getOptionalObjectType()) {
     // If the base type was an optional, look through it.
 
@@ -3504,20 +3427,6 @@ ConstraintSystem::simplifyApplicableFnConstraint(const Constraint &constraint) {
     goto retry;
   }
 
-  // If this is a '()' call, drop the call.
-  if (func1->getInput()->isEqual(TupleType::getEmpty(getASTContext()))) {
-    // We don't bother with a 'None' case, because at this point we won't get
-    // a better diagnostic from that case.
-    if (recordFix(FixKind::RemoveNullaryCall, getConstraintLocator(locator)))
-      return SolutionKind::Error;
-
-    return matchTypes(func1->getResult(), type2,
-                      TypeMatchKind::BindType,
-                      flags | TMF_ApplyingFix | TMF_GenerateConstraints,
-                      locator.withPathElement(
-                        ConstraintLocator::FunctionResult));
-  }
-
   return SolutionKind::Error;
 }
 
@@ -4251,24 +4160,18 @@ bool ConstraintSystem::recordFix(Fix fix, ConstraintLocatorBuilder locator) {
 }
 
 ConstraintSystem::SolutionKind
-ConstraintSystem::simplifyFixConstraint(Fix fix,
-                                        Type type1, Type type2,
-                                        TypeMatchKind matchKind,
-                                        unsigned flags,
+ConstraintSystem::simplifyFixConstraint(Fix fix, Type type1, Type type2,
+                                        TypeMatchKind matchKind, unsigned flags,
                                         ConstraintLocatorBuilder locator) {
-  if (recordFix(fix, locator)) {
+  if (recordFix(fix, locator))
     return SolutionKind::Error;
-  }
 
   // Try with the fix.
   unsigned subFlags = flags | TMF_ApplyingFix | TMF_GenerateConstraints;
   switch (fix.getKind()) {
   case FixKind::None:
     return matchTypes(type1, type2, matchKind, subFlags, locator);
 
-  case FixKind::RemoveNullaryCall:
-    llvm_unreachable("Always applied directly");
-
   case FixKind::ForceOptional:
     // Assume that '!' was applied to the first type.
     return matchTypes(type1->getRValueObjectType()->getOptionalObjectType(),
@@ -4288,10 +4191,7 @@ ConstraintSystem::simplifyFixConstraint(Fix fix,
     // The actual semantics are handled elsewhere.
     return SolutionKind::Solved;
 
-  case FixKind::FromRawToInit:
-  case FixKind::ToRawToRawValue:
   case FixKind::CoerceToCheckedCast:
-  case FixKind::AllZerosToInit:
     llvm_unreachable("handled elsewhere");
   }
 }

lib/Sema/Constraint.cpp

@@ -431,16 +431,8 @@ StringRef Fix::getName(FixKind kind) {
     return "fix: force downcast";
   case FixKind::AddressOf:
     return "fix: add address-of";
-  case FixKind::RemoveNullaryCall:
-    return "fix: remove nullary call";
   case FixKind::OptionalToBoolean:
     return "fix: convert optional to boolean";
-  case FixKind::FromRawToInit:
-    return "fix: fromRaw(x) to init(rawValue:x)";
-  case FixKind::AllZerosToInit:
-    return "fix: x.allZeros to x()";
-  case FixKind::ToRawToRawValue:
-    return "fix: toRaw() to rawValue";
   case FixKind::CoerceToCheckedCast:
     return "fix: as to as!";
   }

lib/Sema/Constraint.h

@@ -240,21 +240,9 @@ enum class FixKind : uint8_t {
 
   /// Introduce a '&' to take the address of an lvalue.
   AddressOf,
-
-  /// Remove a no-argument call to something that is not a function.
-  RemoveNullaryCall,
 
   /// Introduce a '!= nil' to convert an Optional to a Boolean expression.
   OptionalToBoolean,
-
-  /// Replace a use of 'fromRaw' with an initializer requirement.
-  FromRawToInit,
-
-  /// Replace a call of 'toRaw' with a reference to 'rawValue'.
-  ToRawToRawValue,
-
-  /// Replace a call of 'X.allZeros' with a reference to 'X()'.
-  AllZerosToInit,
 
   /// Replace a coercion ('as') with a forced checked cast ('as!').
   CoerceToCheckedCast,

test/Constraints/diagnostics.swift

@@ -271,7 +271,7 @@ _ = { $0 }  // expected-error {{unable to infer closure return type in current c
 
 
 
-_ = 4()   // expected-error {{invalid use of '()' to call a value of non-function type 'Int'}} {{6-8=}}
+_ = 4()   // expected-error {{cannot call value of non-function type 'Int'}}
 _ = 4(1)  // expected-error {{cannot call value of non-function type 'Int'}}