Fix init(from:) required condition

Itai Ferber · Itai Ferber · commit 4c2320724e4a · 2017-04-27T12:44:41.000-07:00
diff --git a/lib/Sema/DerivedConformanceCodable.cpp b/lib/Sema/DerivedConformanceCodable.cpp
@@ -887,7 +887,7 @@ static ValueDecl *deriveDecodable_init(TypeChecker &tc, Decl *parentDecl,
   initDecl->setBodySynthesizer(deriveBodyDecodable_init);
 
   // This constructor should be marked as `required` for non-final classes.
-  if (isa<ClassDecl>(type) && type->getAttrs().hasAttribute<FinalAttr>()) {
+  if (isa<ClassDecl>(type) && !type->getAttrs().hasAttribute<FinalAttr>()) {
     auto *reqAttr = new (C) SimpleDeclAttr<DAK_Required>(/*IsImplicit=*/true);
     initDecl->getAttrs().add(reqAttr);
   }

Original file line number	Diff line number	Diff line change
`@@ -887,7 +887,7 @@ static ValueDecl deriveDecodable_init(TypeChecker &tc, Decl parentDecl,`
`887`	`887`	`initDecl->setBodySynthesizer(deriveBodyDecodable_init);`
`888`	`888`
`889`	`889`	// This constructor should be marked as `required` for non-final classes.
`890`		`- if (isa<ClassDecl>(type) && type->getAttrs().hasAttribute<FinalAttr>()) {`
	`890`	`+ if (isa<ClassDecl>(type) && !type->getAttrs().hasAttribute<FinalAttr>()) {`
`891`	`891`	`auto reqAttr = new (C) SimpleDeclAttr<DAK_Required>(/IsImplicit=*/true);`
`892`	`892`	`initDecl->getAttrs().add(reqAttr);`
`893`	`893`	`}`