fix build failures

Author: tayloraswift

include/swift/AST/ASTContext.h

@@ -415,9 +415,6 @@ class ASTContext final {
   void setStatsReporter(UnifiedStatsReporter *stats);
 
 private:
-  /// Set the lazy resolver for this context.
-  void setLazyResolver(LazyResolver *resolver);
-  
   // get `<` or `==`
   FuncDecl *getBinaryComparisonOperatorIntDecl(StringRef op, FuncDecl **cached) const;
 

lib/Sema/DerivedConformanceComparable.cpp

@@ -306,15 +306,16 @@ deriveComparable_lt(
     DerivedConformance &derived,
     std::pair<BraceStmt *, bool> (*bodySynthesizer)(AbstractFunctionDecl *,
                                                     void *)) {
-  ASTContext &C = derived.TC.Context;
+  ASTContext &C = derived.Context;
 
   auto parentDC = derived.getConformanceContext();
   auto selfIfaceTy = parentDC->getDeclaredInterfaceType();
 
   auto getParamDecl = [&](StringRef s) -> ParamDecl * {
-    auto *param = new (C) ParamDecl(ParamDecl::Specifier::Default, SourceLoc(),
+    auto *param = new (C) ParamDecl(SourceLoc(),
                                     SourceLoc(), Identifier(), SourceLoc(),
                                     C.getIdentifier(s), parentDC);
+    param->setSpecifier(ParamSpecifier::Default);
     param->setInterfaceType(selfIfaceTy);
     return param;
   };
@@ -356,28 +357,20 @@ deriveComparable_lt(
     auto comparableDeclName = DeclName(C, DeclBaseName(C.Id_LessThanOperator),
                                    argumentLabels);
     comparableDecl->getAttrs().add(new (C) ImplementsAttr(SourceLoc(),
-                                                  SourceRange(),
-                                                  comparableTypeLoc,
-                                                  comparableDeclName,
-                                                  DeclNameLoc()));
+                                                          SourceRange(),
+                                                          comparableTypeLoc,
+                                                          comparableDeclName,
+                                                          DeclNameLoc()));
   }
 
   if (!C.getLessThanIntDecl()) {
-    derived.TC.diagnose(derived.ConformanceDecl->getLoc(),
-                        diag::no_less_than_overload_for_int);
+    derived.ConformanceDecl->diagnose(diag::no_less_than_overload_for_int);
     return nullptr;
   }
 
   comparableDecl->setBodySynthesizer(bodySynthesizer);
 
-  // Compute the interface type.
-  comparableDecl->setGenericSignature(parentDC->getGenericSignatureOfContext());
-  comparableDecl->computeType();
-
   comparableDecl->copyFormalAccessFrom(derived.Nominal, /*sourceIsParentContext*/ true);
-  comparableDecl->setValidationToChecked();
-
-  C.addSynthesizedDecl(comparableDecl);
 
   // Add the operator to the parent scope.
   derived.addMembersToConformanceContext({comparableDecl});
@@ -413,6 +406,6 @@ ValueDecl *DerivedConformance::deriveComparable(ValueDecl *requirement) {
       llvm_unreachable("todo");
     }
   }
-  TC.diagnose(requirement->getLoc(), diag::broken_comparable_requirement);
+  requirement->diagnose(diag::broken_comparable_requirement);
   return nullptr;
 }

test/Sema/enum_conformance_synthesis.swift

@@ -337,12 +337,12 @@ func pit(_ a: Angel, against b: Angel) -> Bool {
 }
 
 // enums with non-conforming payloads don’t get synthesized Comparable 
-enum Notice: Comparable { // expected-error{{type 'Notice' does not conform to protocol 'Comparable'}} expected-error{{type 'Notice' does not conform to protocol 'Equatable'}} expected-note {{do you want to add protocol stubs?}} expected-note {{do you want to add protocol stubs?}}
+enum Notice: Comparable { // expected-error{{type 'Notice' does not conform to protocol 'Comparable'}} expected-error{{type 'Notice' does not conform to protocol 'Equatable'}} 
   case taylor((Int, Int)), taylornation(Int) // expected-note{{associated value type '(Int, Int)' does not conform to protocol 'Equatable', preventing synthesized conformance of 'Notice' to 'Equatable'}} 
 }
 
 // neither do enums with raw values 
-enum Track: Int, Comparable { // expected-error{{type 'Track' does not conform to protocol 'Comparable'}} expected-note {{do you want to add protocol stubs?}}
+enum Track: Int, Comparable { // expected-error{{type 'Track' does not conform to protocol 'Comparable'}} 
   case four = 4
   case five = 5 
   case six  = 6