Update the reflection printer to not omit parens from single argument

function types.  This exposes something which I think is a bug in the
reflection encoding, I'll chat with Slava about it.

Author: lattner

stdlib/public/runtime/Casting.cpp

@@ -161,41 +161,19 @@ static void _buildFunctionTypeName(const FunctionTypeMetadata *func,
                                    bool qualified,
                                    std::string &result) {
 
-  if (func->getNumArguments() == 1) {
-    auto firstArgument = func->getArguments()[0].getPointer();
-    bool isInout = func->getArguments()[0].getFlag();
-
-    // This could be a single input tuple, with one or more arguments inside,
-    // but guaranteed to not have inout types.
-    if (auto tupleMetadata = dyn_cast<TupleTypeMetadata>(firstArgument)) {
-          _buildNameForMetadata(tupleMetadata,
-                                TypeSyntaxLevel::TypeSimple,
-                                qualified,
-                                result);
-    } else {
-      if (isInout)
-        result += "inout ";
-
-      _buildNameForMetadata(firstArgument,
-                            TypeSyntaxLevel::TypeSimple,
-                            qualified,
-                            result);
+  result += "(";
+  for (size_t i = 0; i < func->getNumArguments(); ++i) {
+    auto arg = func->getArguments()[i].getPointer();
+    bool isInout = func->getArguments()[i].getFlag();
+    if (isInout)
+      result += "inout ";
+    _buildNameForMetadata(arg, TypeSyntaxLevel::TypeSimple,
+                          qualified, result);
+    if (i < func->getNumArguments() - 1) {
+      result += ", ";
     }
-  } else {
-      result += "(";
-      for (size_t i = 0; i < func->getNumArguments(); ++i) {
-        auto arg = func->getArguments()[i].getPointer();
-        bool isInout = func->getArguments()[i].getFlag();
-        if (isInout)
-          result += "inout ";
-        _buildNameForMetadata(arg, TypeSyntaxLevel::TypeSimple,
-                              qualified, result);
-        if (i < func->getNumArguments() - 1) {
-          result += ", ";
-        }
-      }
-      result += ")";
   }
+  result += ")";
 
   if (func->throws()) {
     result += " throws";

test/1_stdlib/TypeName.swift

@@ -50,9 +50,10 @@ typealias F = () -> ()
 typealias F2 = () -> () -> ()
 typealias F3 = (() -> ()) -> ()
 
-printTypeName(F.self) // CHECK-NEXT: () -> ()
-printTypeName(F2.self) // CHECK-NEXT: () -> () -> ()
-printTypeName(F3.self) // CHECK-NEXT: (() -> ()) -> ()
+printTypeName(F.self) // CHECK-NEXT: (()) -> ()
+printTypeName(F2.self) // CHECK-NEXT: (()) -> (()) -> ()
+printTypeName(F3.self) // CHECK-NEXT: (((()) -> ())) -> ()
+
 
 #if _runtime(_ObjC)
 typealias B = @convention(block) () -> ()
@@ -66,11 +67,11 @@ print("@convention(block) () -> ()")
 print("() -> @convention(block) () -> ()")
 print("(@convention(block) () -> ()) -> ()")
 #endif
-// CHECK-NEXT: @convention(block) () -> ()
-// CHECK-NEXT: () -> @convention(block) () -> ()
-// CHECK-NEXT: (@convention(block) () -> ()) -> ()
+// CHECK-NEXT: @convention(block) (()) -> ()
+// CHECK-NEXT: (()) -> @convention(block) (()) -> ()
+// CHECK-NEXT: ((@convention(block) (()) -> ())) -> ()
 
-printTypeName(F.Type.self) // CHECK-NEXT: (() -> ()).Type
+printTypeName(F.Type.self) // CHECK-NEXT: ((()) -> ()).Type
 printTypeName(C.Type.self) // CHECK-NEXT: [[THIS]].C.Type
 printTypeName(C.Type.Type.self) // CHECK-NEXT: [[THIS]].C.Type.Type
 printTypeName(Any.Type.self) // CHECK-NEXT: protocol<>.Type
@@ -81,24 +82,24 @@ printTypeName((AnyObject?).self) // CHECK-NEXT: {{^}}Swift.Optional<Swift.AnyObj
 
 printTypeName(Void.self) // CHECK-NEXT: ()
 typealias Tup = (Any, F, C)
-printTypeName(Tup.self) // CHECK-NEXT: (protocol<>, () -> (), [[THIS]].C)
+printTypeName(Tup.self) // CHECK-NEXT: (protocol<>, (()) -> (), [[THIS]].C)
 
-typealias IF = inout Int -> ()
-typealias IF2 = inout Int -> inout Int -> ()
-typealias IF3 = (inout Int -> ()) -> ()
-typealias IF3a = (inout (Int -> ())) -> ()
-typealias IF3b = inout (Int -> ()) -> ()
+typealias IF = (inout Int) -> ()
+typealias IF2 = (inout Int) -> (inout Int) -> ()
+typealias IF3 = ((inout Int) -> ()) -> ()
+typealias IF3a = (inout ((Int) -> ())) -> ()
+typealias IF3b = (inout ((Int) -> ())) -> ()
 typealias IF3c = ((inout Int) -> ()) -> ()
-typealias IF4 = inout (() -> ()) -> ()
+typealias IF4 = (inout (() -> ())) -> ()
 typealias IF5 = (inout Int, Any) -> ()
 
-printTypeName(IF.self) // CHECK-NEXT: inout Swift.Int -> ()
-printTypeName(IF2.self) // CHECK-NEXT: inout Swift.Int -> inout Swift.Int -> ()
-printTypeName(IF3.self) // CHECK-NEXT: inout (Swift.Int -> ()) -> ()
-printTypeName(IF3a.self) // CHECK-NEXT: inout (Swift.Int -> ()) -> ()
-printTypeName(IF3b.self) // CHECK-NEXT: inout (Swift.Int -> ()) -> ()
-printTypeName(IF3c.self) // CHECK-NEXT: (inout Swift.Int -> ()) -> ()
-printTypeName(IF4.self) // CHECK-NEXT: inout (() -> ()) -> ()
+printTypeName(IF.self) // CHECK-NEXT: (inout Swift.Int) -> ()
+printTypeName(IF2.self) // CHECK-NEXT: (inout Swift.Int) -> (inout Swift.Int) -> ()
+printTypeName(IF3.self) // CHECK-NEXT: (((inout Swift.Int) -> ())) -> ()
+printTypeName(IF3a.self) // CHECK-NEXT: (inout ((Swift.Int) -> ())) -> ()
+printTypeName(IF3b.self) // CHECK-NEXT: (inout ((Swift.Int) -> ())) -> ()
+printTypeName(IF3c.self) // CHECK-NEXT: (((inout Swift.Int) -> ())) -> ()
+printTypeName(IF4.self) // CHECK-NEXT: (inout ((()) -> ())) -> ()
 printTypeName(IF5.self) // CHECK-NEXT: (inout Swift.Int, protocol<>) -> ()
 
 func curry1() {
@@ -125,12 +126,12 @@ func curry3Throws() throws -> () throws -> () {
 	return curry1Throws
 }
 
-printTypeName(curry1.dynamicType) // CHECK-NEXT: () -> ()
+printTypeName(curry1.dynamicType) // CHECK-NEXT: (()) -> ()
 
-printTypeName(curry2.dynamicType) // CHECK-NEXT: () -> () -> ()
+printTypeName(curry2.dynamicType) // CHECK-NEXT: (()) -> (()) -> ()
 
-printTypeName(curry2Throws.dynamicType) // CHECK-NEXT: () throws -> () -> ()
+printTypeName(curry2Throws.dynamicType) // CHECK-NEXT: (()) throws -> (()) -> ()
 
-printTypeName(curry3.dynamicType) // CHECK-NEXT: () -> () throws -> ()
+printTypeName(curry3.dynamicType) // CHECK-NEXT: (()) -> (()) throws -> ()
 
-printTypeName(curry3Throws.dynamicType) // CHECK-NEXT: () throws -> () throws -> ()
+printTypeName(curry3Throws.dynamicType) // CHECK-NEXT: (()) throws -> (()) throws -> ()