Fix more merge damage

Author: asuhan

lib/Sema/DerivedConformanceDifferentiable.cpp

@@ -346,7 +346,6 @@ static ValueDecl *deriveDifferentiable_method(
   funcDecl->setGenericSignature(parentDC->getGenericSignatureOfContext());
   funcDecl->computeType();
   funcDecl->copyFormalAccessFrom(nominal, /*sourceIsParentContext*/ true);
-  funcDecl->setValidationToChecked();
 
   derived.addMembersToConformanceContext({funcDecl});
   C.addSynthesizedDecl(funcDecl);
@@ -614,7 +613,6 @@ getOrSynthesizeTangentVectorStruct(DerivedConformance &derived, Identifier id) {
     structDecl->addMember(newMember);
     structDecl->addMember(memberBinding);
     newMember->copyFormalAccessFrom(member, /*sourceIsParentContext*/ true);
-    newMember->setValidationToChecked();
     newMember->setSetterAccess(member->getFormalAccess());
     C.addSynthesizedDecl(newMember);
     C.addSynthesizedDecl(memberBinding);
@@ -701,7 +699,6 @@ static void addAssociatedTypeAliasDecl(Identifier name,
   aliasDecl->setGenericSignature(sourceDC->getGenericSignatureOfContext());
   cast<IterableDeclContext>(sourceDC->getAsDecl())->addMember(aliasDecl);
   aliasDecl->copyFormalAccessFrom(nominal, /*sourceIsParentContext*/ true);
-  aliasDecl->setValidationToChecked();
   aliasDecl->computeType();
   TC.validateDecl(aliasDecl);
   C.addSynthesizedDecl(aliasDecl);
@@ -848,7 +845,6 @@ deriveDifferentiable_TangentVectorStruct(DerivedConformance &derived) {
     aliasDecl->setUnderlyingType(selfType);
     aliasDecl->setImplicit();
     aliasDecl->copyFormalAccessFrom(nominal, /*sourceIsParentContext*/ true);
-    aliasDecl->setValidationToChecked();
     aliasDecl->computeType();
     TC.validateDecl(aliasDecl);
     derived.addMembersToConformanceContext({aliasDecl});

lib/Sema/DerivedConformanceElementaryFunctions.cpp

@@ -303,7 +303,6 @@ ElementaryFunction op) {
   operatorDecl->setGenericSignature(parentDC->getGenericSignatureOfContext());
   operatorDecl->computeType();
   operatorDecl->copyFormalAccessFrom(nominal, /*sourceIsParentContext*/ true);
-  operatorDecl->setValidationToChecked();
 
   derived.addMembersToConformanceContext({operatorDecl});
   C.addSynthesizedDecl(operatorDecl);

lib/Sema/DerivedConformanceRingMathProtocols.cpp

@@ -256,7 +256,6 @@ static ValueDecl *deriveMathOperator(DerivedConformance &derived,
   operatorDecl->setGenericSignature(parentDC->getGenericSignatureOfContext());
   operatorDecl->computeType();
   operatorDecl->copyFormalAccessFrom(nominal, /*sourceIsParentContext*/ true);
-  operatorDecl->setValidationToChecked();
 
   derived.addMembersToConformanceContext({operatorDecl});
   C.addSynthesizedDecl(operatorDecl);

lib/Sema/DerivedConformanceTensorArrayProtocol.cpp

@@ -109,7 +109,6 @@ deriveBodyTensorArrayProtocol_unpackTensorHandles(
   currAddressDecl->setImplicit();
   currAddressDecl->setHasNonPatternBindingInit(true);
   currAddressDecl->setInterfaceType(baseAddressType);
-  currAddressDecl->setValidationToChecked();
 
   Pattern *currAddressPat = new (C)
       NamedPattern(currAddressDecl, /*implicit*/ true);
@@ -245,7 +244,6 @@ static ValueDecl *deriveTensorArrayProtocol_method(
   funcDecl->setGenericSignature(parentDC->getGenericSignatureOfContext());
   funcDecl->computeType();
   funcDecl->copyFormalAccessFrom(nominal, /*sourceIsParentContext*/ true);
-  funcDecl->setValidationToChecked();
 
   derived.addMembersToConformanceContext({funcDecl});
   C.addSynthesizedDecl(funcDecl);
@@ -471,7 +469,6 @@ deriveBodyTensorArrayProtocol_init(AbstractFunctionDecl *funcDecl, void *) {
   currAddressDecl->setImplicit();
   currAddressDecl->setHasNonPatternBindingInit(true);
   currAddressDecl->setInterfaceType(baseAddressType);
-  currAddressDecl->setValidationToChecked();
 
   Pattern *currAddressPat = new (C)
       NamedPattern(currAddressDecl, /*implicit*/ true);
@@ -648,7 +645,6 @@ static ValueDecl
   initDecl->setGenericSignature(parentDC->getGenericSignatureOfContext());
   initDecl->computeType(AnyFunctionType::ExtInfo().withThrows(false));
   initDecl->copyFormalAccessFrom(nominal, /*sourceIsParentContext*/ true);
-  initDecl->setValidationToChecked();
 
   derived.addMembersToConformanceContext({initDecl});
   C.addSynthesizedDecl(initDecl);

lib/Sema/DerivedConformanceTensorGroup.cpp

@@ -175,7 +175,6 @@ deriveBodyTensorGroup_init(AbstractFunctionDecl *funcDecl, void *) {
   currAddressDecl->setImplicit();
   currAddressDecl->setHasNonPatternBindingInit(true);
   currAddressDecl->setInterfaceType(baseAddressType);
-  currAddressDecl->setValidationToChecked();
 
   Pattern *currAddressPat = new (C)
       NamedPattern(currAddressDecl, /*implicit*/ true);
@@ -341,7 +340,6 @@ static ValueDecl *deriveTensorGroup_constructor(
   initDecl->setGenericSignature(parentDC->getGenericSignatureOfContext());
   initDecl->computeType(AnyFunctionType::ExtInfo().withThrows(false));
   initDecl->copyFormalAccessFrom(nominal, /*sourceIsParentContext*/ true);
-  initDecl->setValidationToChecked();
 
   derived.addMembersToConformanceContext({initDecl});
   C.addSynthesizedDecl(initDecl);

lib/Sema/DerivedConformanceVectorProtocol.cpp

@@ -231,7 +231,6 @@ static ValueDecl *deriveVectorProtocol_method(
   funcDecl->setGenericSignature(parentDC->getGenericSignatureOfContext());
   funcDecl->computeType();
   funcDecl->copyFormalAccessFrom(nominal, /*sourceIsParentContext*/ true);
-  funcDecl->setValidationToChecked();
 
   derived.addMembersToConformanceContext({funcDecl});
   C.addSynthesizedDecl(funcDecl);

lib/Sema/DerivedConformances.cpp

@@ -577,7 +577,6 @@ DerivedConformance::declareDerivedPropertySetter(VarDecl *property,
   setterDecl->setGenericSignature(parentDC->getGenericSignatureOfContext());
   setterDecl->computeType();
   setterDecl->copyFormalAccessFrom(property);
-  setterDecl->setValidationToChecked();
 
   C.addSynthesizedDecl(setterDecl);
   return setterDecl;

lib/Sema/TypeCheckDecl.cpp

@@ -4130,18 +4130,6 @@ void TypeChecker::validateDecl(ValueDecl *D) {
     // TODO(TF-789): Figure out the proper way to typecheck these.
     checkDeclDifferentiableAttributes(FD);
 
-    // Member functions need some special validation logic.
-    if (FD->getDeclContext()->isTypeContext()) {
-      if (FD->isOperator() && !isMemberOperator(FD, nullptr)) {
-        auto selfNominal = FD->getDeclContext()->getSelfNominalTypeDecl();
-        auto isProtocol = selfNominal && isa<ProtocolDecl>(selfNominal);
-        // We did not find 'Self'. Complain.
-        diagnose(FD, diag::operator_in_unrelated_type,
-                 FD->getDeclContext()->getDeclaredInterfaceType(), isProtocol,
-                 FD->getFullName());
-      }
-    }
-
     // If the function is exported to C, it must be representable in (Obj-)C.
     if (auto CDeclAttr = FD->getAttrs().getAttribute<swift::CDeclAttr>()) {
       Optional<ForeignErrorConvention> errorConvention;

test/Syntax/Outputs/round_trip_parse_gen.swift.withkinds

@@ -586,7 +586,7 @@ func foo<FunctionSignature><ParameterClause>() </ParameterClause></FunctionSigna
 #"<StringSegment>abc</StringSegment>"#</StringLiteralExpr><StringLiteralExpr>
 #"<StringSegment>abc </StringSegment><ExpressionSegment>\#(<TupleExprElement><IdentifierExpr>foo</IdentifierExpr></TupleExprElement>)</ExpressionSegment><StringSegment></StringSegment>"#</StringLiteralExpr><StringLiteralExpr>
 ##"<StringSegment>abc</StringSegment>"##</StringLiteralExpr><StringLiteralExpr>
-##"<StringSegment>abc </StringSegment><ExpressionSegment>\##(<TupleExprElement><IdentifierExpr>foo</IdentifierExpr></TupleExprElement>)</ExpressionSegment><StringSegment></StringSegment>"##</StringLiteralExpr>
+##"<StringSegment>abc </StringSegment><ExpressionSegment>\##(<TupleExprElement><IdentifierExpr>foo</IdentifierExpr></TupleExprElement>)</ExpressionSegment><StringSegment></StringSegment>"##</StringLiteralExpr><FunctionDecl><Attribute>
 
 // SWIFT_ENABLE_TENSORFLOW
 @differentiable(<DifferentiableAttributeArguments><DifferentiableAttributeFuncSpecifier>jvp: <FunctionDeclName>foo<DeclNameArguments>(<DeclNameArgument>_:</DeclNameArgument><DeclNameArgument>_:</DeclNameArgument>)</DeclNameArguments></FunctionDeclName></DifferentiableAttributeFuncSpecifier></DifferentiableAttributeArguments>)</Attribute>
@@ -607,11 +607,11 @@ func bar<GenericParameterClause><<GenericParameter>T : <SimpleTypeIdentifier>Num
 @differentiating(<DifferentiatingAttributeArguments><FunctionDeclName>-</FunctionDeclName></DifferentiatingAttributeArguments>)</Attribute>
 func negateDerivative<FunctionSignature><ParameterClause>(<FunctionParameter>_ x: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionParameter>)</ParameterClause><ReturnClause>
     -> <TupleType>(<TupleTypeElement>value: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </TupleTypeElement><TupleTypeElement>pullback: <FunctionType>(<TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier></TupleTypeElement>) -> <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionType></TupleTypeElement>) </TupleType></ReturnClause></FunctionSignature><CodeBlock>{<ReturnStmt>
-  return <TupleExpr>(<TupleElement><PrefixOperatorExpr>-<IdentifierExpr>x</IdentifierExpr></PrefixOperatorExpr>, </TupleElement><TupleElement><ClosureExpr>{ <ClosureSignature><ClosureParam>v </ClosureParam>in </ClosureSignature><PrefixOperatorExpr>-<IdentifierExpr>v </IdentifierExpr></PrefixOperatorExpr>}</ClosureExpr></TupleElement>)</TupleExpr></ReturnStmt>
+  return <TupleExpr>(<TupleExprElement><PrefixOperatorExpr>-<IdentifierExpr>x</IdentifierExpr></PrefixOperatorExpr>, </TupleExprElement><TupleExprElement><ClosureExpr>{ <ClosureSignature><ClosureParam>v </ClosureParam>in </ClosureSignature><PrefixOperatorExpr>-<IdentifierExpr>v </IdentifierExpr></PrefixOperatorExpr>}</ClosureExpr></TupleExprElement>)</TupleExpr></ReturnStmt>
 }</CodeBlock></FunctionDecl><FunctionDecl><Attribute>
 
 @differentiating(<DifferentiatingAttributeArguments><FunctionDeclName>baz<DeclNameArguments>(<DeclNameArgument>label:</DeclNameArgument><DeclNameArgument>_:</DeclNameArgument>)</DeclNameArguments></FunctionDeclName></DifferentiatingAttributeArguments>)</Attribute>
 func bazDerivative<FunctionSignature><ParameterClause>(<FunctionParameter>_ x: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </FunctionParameter><FunctionParameter>y: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionParameter>)</ParameterClause><ReturnClause>
     -> <TupleType>(<TupleTypeElement>value: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </TupleTypeElement><TupleTypeElement>pullback: <FunctionType>(<TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier></TupleTypeElement>) -> <TupleType>(<TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </TupleTypeElement><TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier></TupleTypeElement>)</TupleType></FunctionType></TupleTypeElement>) </TupleType></ReturnClause></FunctionSignature><CodeBlock>{<ReturnStmt>
-  return <TupleExpr>(<TupleElement><IdentifierExpr>x</IdentifierExpr>, </TupleElement><TupleElement><ClosureExpr>{ <ClosureSignature><ClosureParam>v </ClosureParam>in </ClosureSignature><IdentifierExpr>v </IdentifierExpr>}</ClosureExpr></TupleElement>)</TupleExpr></ReturnStmt>
+  return <TupleExpr>(<TupleExprElement><IdentifierExpr>x</IdentifierExpr>, </TupleExprElement><TupleExprElement><ClosureExpr>{ <ClosureSignature><ClosureParam>v </ClosureParam>in </ClosureSignature><IdentifierExpr>v </IdentifierExpr>}</ClosureExpr></TupleExprElement>)</TupleExpr></ReturnStmt>
 }</CodeBlock></FunctionDecl>