Following up on r31169, take Jordan's CR feedback and uncomment the two currently disabled migration aid overloads for 'print'.

Swift SVN r31176

Author: jopamer

lib/Sema/CSApply.cpp

@@ -3283,9 +3283,7 @@ namespace {
 
       // Coerce the object type, if necessary.
       auto subExpr = expr->getSubExpr();
-      if (auto opTy = dyn_cast<OptionalType>(subExpr->getType().getPointer())) {
-        auto objectTy = opTy->getAnyOptionalObjectType();
-        
+      if (auto objectTy = subExpr->getType()->getAnyOptionalObjectType()) {        
         if (objectTy && !objectTy->isEqual(valueType)) {
           auto coercedSubExpr = coerceToType(subExpr,
                                              OptionalType::get(valueType),

stdlib/public/core/Print.swift

@@ -146,12 +146,10 @@ internal func _debugPrint<Target: OutputStreamType>(
 //===----------------------------------------------------------------------===//
 //===--- Migration Aids ---------------------------------------------------===//
 
-/* FIXME: Disabled because we need these signatures for our workarounds below
 @available(*, unavailable, message="Please wrap your tuple argument in parentheses: 'print((...))'")
 public func print<T>(_: T) {}
 @available(*, unavailable, message="Please wrap your tuple argument in parentheses: 'debugPrint((...))'")
 public func debugPrint<T>(_: T) {}
-*/
 
 @available(*, unavailable, message="Please use 'terminator: \"\"' instead of 'appendNewline: false': 'print((...), terminator: \"\")'")
 public func print<T>(_: T, appendNewline: Bool) {}

test/1_stdlib/PrintDiagnostics.swift

@@ -12,4 +12,4 @@ print(3, &stream) // expected-error {{'&' can only appear immediately in a call
 debugPrint(3, &stream) // expected-error {{'&' can only appear immediately in a call argument list}}
 print(3, &stream, appendNewline: false) // expected-error {{cannot invoke 'print' with an argument list of type}} expected-note {{expected an argument list of type}}
 debugPrint(3, &stream, appendNewline: false) // expected-error {{cannot invoke 'debugPrint' with an argument list of type}} expected-note {{expected an argument list of type}}
-print(4, quack: 5) // expected-error {{cannot invoke 'print' with an argument list of type '(Int, quack: Int)'}} expected-note {{expected an argument list of type '(Any..., separator: String, terminator: String)'}}
+print(4, quack: 5) // expected-error {{'print' is unavailable: Please wrap your tuple argument in parentheses: 'print((...))'}}