Bonus fix: Avoid an extra space after a return type ending in *.

I'm including this because the code fix was similar to a fix that was
originally in the multi-decl overhaul before the same fix was needed in
#702 and I was
aware of the issue from item 4 of
#703.

Author: mattmccutchen-cci

clang/lib/3C/ConstraintVariables.cpp

@@ -1001,7 +1001,7 @@ PointerVariableConstraint::mkString(Constraints &CS,
       Ss << Str;
   }
 
-  if (IsReturn && !ForItype)
+  if (IsReturn && !ForItype && !StringRef(Ss.str()).endswith("*"))
     Ss << " ";
 
   return Ss.str();

clang/test/3C/itype_typedef.c

@@ -34,7 +34,7 @@ void test2(td2 a) {
 typedef int *td3;
 td3 test3() {
 //CHECK: typedef _Ptr<int> td3;
-//CHECK: int * test3(void) : itype(td3) {
+//CHECK: int *test3(void) : itype(td3) {
   return (int*) 1;
 }
 

clang/test/3C/itypes_for_extern.c

@@ -30,14 +30,19 @@ int *baz(int *a, int len, int *b) {
   return a;
 }
 
+// REVIEW: The problem described in the following comment has been fixed roughly
+// in the "first way": the canonical form of the type from mkString no longer
+// has the space, so the test will pass as long as the original code didn't have
+// the space either. If we still want to pursue the second fix, do we want to
+// note that somehow, e.g., by filing an issue?
 // FIXME: The space between after the first star is needed for the idempotence
 //        test to pass. If there isn't a space there, 3c will add one when
 //        re-run on its original output. This should be fixed ideally in two
 //        ways.  First, the space shouldn't be added when not present in the
 //        original source, and second, the second conversion should not rewrite
 //        the declaration.
-void buz(int * (*f)(int *, int *)) {}
-//CHECK: void buz(int * ((*f)(int *, int *)) : itype(_Ptr<_Ptr<int> (_Ptr<int>, _Ptr<int>)>)) _Checked {}
+void buz(int *(*f)(int *, int *)) {}
+//CHECK: void buz(int *((*f)(int *, int *)) : itype(_Ptr<_Ptr<int> (_Ptr<int>, _Ptr<int>)>)) _Checked {}
 
 typedef int * int_star;
 void typedef_test(int_star p) {}