Disable passing move-only types to our generic logging functions in Playground Transform, as such types are not supported in generics yet.

Author: dbukowski

lib/Sema/PlaygroundTransform.cpp

@@ -429,7 +429,7 @@ class Instrumenter : InstrumenterBase {
                 ++EI;
               }
             }
-          } else {
+          } else if (shouldLogType(AE->getSrc()->getType())) {
             std::pair<PatternBindingDecl *, VarDecl *> PV =
                 buildPatternAndVariable(AE->getSrc());
             DeclRefExpr *DRE = new (Context)
@@ -521,7 +521,7 @@ class Instrumenter : InstrumenterBase {
             }
             Handled = true; // Never log ()
           }
-          if (!Handled) {
+          if (!Handled && shouldLogType(E->getType())) {
             // do the same as for all other expressions
             std::pair<PatternBindingDecl *, VarDecl *> PV =
                 buildPatternAndVariable(E);
@@ -539,7 +539,7 @@ class Instrumenter : InstrumenterBase {
             }
           }
         } else {
-          if (E->getType()->getCanonicalType() != Context.TheEmptyTupleType) {
+          if (E->getType()->getCanonicalType() != Context.TheEmptyTupleType && shouldLogType(E->getType())) {
             std::pair<PatternBindingDecl *, VarDecl *> PV =
                 buildPatternAndVariable(E);
             Added<Stmt *> Log = buildLoggerCall(
@@ -559,7 +559,7 @@ class Instrumenter : InstrumenterBase {
       } else if (auto *S = Element.dyn_cast<Stmt *>()) {
         S->walk(CF);
         if (auto *RS = dyn_cast<ReturnStmt>(S)) {
-          if (RS->hasResult()) {
+          if (RS->hasResult() && shouldLogType(RS->getResult()->getType())) {
             std::pair<PatternBindingDecl *, VarDecl *> PV =
                 buildPatternAndVariable(RS->getResult());
             DeclRefExpr *DRE = new (Context) DeclRefExpr(
@@ -621,7 +621,7 @@ class Instrumenter : InstrumenterBase {
     if (PL && Options.LogFunctionParameters) {
       size_t EI = 0;
       for (const auto &PD : *PL) {
-        if (PD->hasName()) {
+        if (PD->hasName() && shouldLogType(PD->getInterfaceType())) {
           DeclBaseName Name = PD->getName();
           Expr *PVVarRef = new (Context)
               DeclRefExpr(PD, DeclNameLoc(), /*implicit=*/true,
@@ -658,6 +658,10 @@ class Instrumenter : InstrumenterBase {
   // after or instead of the expression they're looking at.  Only call this
   // if the variable has an initializer.
   Added<Stmt *> logVarDecl(VarDecl *VD) {
+    if (!shouldLogType(VD->getInterfaceType())) {
+      return nullptr;
+    }
+
     if (isa<ConstructorDecl>(TypeCheckDC) && VD->getNameStr().equals("self")) {
       // Don't log "self" in a constructor
       return nullptr;
@@ -674,6 +678,10 @@ class Instrumenter : InstrumenterBase {
     if (auto *DRE = dyn_cast<DeclRefExpr>(*RE)) {
       VarDecl *VD = cast<VarDecl>(DRE->getDecl());
 
+      if (!shouldLogType(VD->getInterfaceType())) {
+        return nullptr;
+      }
+
       if (isa<ConstructorDecl>(TypeCheckDC) && VD->getBaseName() == "self") {
         // Don't log "self" in a constructor
         return nullptr;
@@ -686,6 +694,11 @@ class Instrumenter : InstrumenterBase {
     } else if (auto *MRE = dyn_cast<MemberRefExpr>(*RE)) {
       Expr *B = MRE->getBase();
       ConcreteDeclRef M = MRE->getMember();
+      VarDecl *VD = cast<VarDecl>(M.getDecl());
+
+      if (!shouldLogType(VD->getInterfaceType())) {
+        return nullptr;
+      }
 
       if (isa<ConstructorDecl>(TypeCheckDC) && digForName(B) == "self") {
         // Don't log attributes of "self" in a constructor
@@ -786,6 +799,14 @@ class Instrumenter : InstrumenterBase {
     return std::make_pair(PBD, VD);
   }
 
+  bool shouldLogType(Type Ty) {
+    // Don't try to log ~Copyable types, as we can't pass them to the generic logging functions yet.
+    if (Ty->isNoncopyable()) {
+      return false;
+    }
+    return true;
+  }
+
   Added<Stmt *> buildLoggerCall(Added<Expr *> E, SourceRange SR,
                                 StringRef Name) {
     Expr *NameExpr = new (Context) StringLiteralExpr(