remove #if 1

lattner · lattner · commit 4242af7503d8 · 2016-07-16T23:23:45.000-07:00
diff --git a/lib/Sema/CSSimplify.cpp b/lib/Sema/CSSimplify.cpp
@@ -2303,7 +2303,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
   
   if (!shouldAttemptFixes())
     return SolutionKind::Error;
-#if 1
+
   // See if there's anything we can do to fix the conformance:
   OptionalTypeKind optionalKind;
   if (auto optionalObjectType = type->getAnyOptionalObjectType(optionalKind)) {
@@ -2326,7 +2326,6 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
       return result;
     }
   }
-#endif
   
   // There's nothing more we can do; fail.
   return SolutionKind::Error;

Original file line number	Diff line number	Diff line change
`@@ -2303,7 +2303,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(`
`2303`	`2303`
`2304`	`2304`	`if (!shouldAttemptFixes())`
`2305`	`2305`	`return SolutionKind::Error;`
`2306`		`-#if 1`
	`2306`	`+`
`2307`	`2307`	`// See if there's anything we can do to fix the conformance:`
`2308`	`2308`	`OptionalTypeKind optionalKind;`
`2309`	`2309`	`if (auto optionalObjectType = type->getAnyOptionalObjectType(optionalKind)) {`
`@@ -2326,7 +2326,6 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(`
`2326`	`2326`	`return result;`
`2327`	`2327`	`}`
`2328`	`2328`	`}`
`2329`		`-#endif`
`2330`	`2329`
`2331`	`2330`	`// There's nothing more we can do; fail.`
`2332`	`2331`	`return SolutionKind::Error;`