Sema: Fix PlaygroundTransform for noncopyable generics

Author: slavapestov

lib/Sema/PlaygroundTransform.cpp

@@ -799,11 +799,15 @@ class Instrumenter : InstrumenterBase {
 
   bool shouldLog(ASTNode node) {
     // Don't try to log ~Copyable types, as we can't pass them to the generic logging functions yet.
-    if (auto *VD = dyn_cast_or_null<ValueDecl>(node.dyn_cast<Decl *>()))
-      return VD->hasInterfaceType() ? !VD->getInterfaceType()->isNoncopyable() : true;
-    if (auto *E = node.dyn_cast<Expr *>())
+    if (auto *VD = dyn_cast_or_null<ValueDecl>(node.dyn_cast<Decl *>())) {
+      auto interfaceTy = VD->getInterfaceType();
+      auto contextualTy = VD->getInnermostDeclContext()->mapTypeIntoContext(interfaceTy);
+      return !contextualTy->isNoncopyable();
+    } else if (auto *E = node.dyn_cast<Expr *>()) {
       return !E->getType()->isNoncopyable();
-    return true;
+    } else {
+      return true;
+    }
   }
 
   Added<Stmt *> buildLoggerCall(Added<Expr *> E, SourceRange SR,

test/PlaygroundTransform/generics.swift

@@ -9,8 +9,6 @@
 // RUN: %target-run %t/main2 | %FileCheck %s
 // REQUIRES: executable_test
 
-// XFAIL: noncopyable_generics
-
 import PlaygroundSupport
 
 func id<T>(_ t: T) -> T {

test/PlaygroundTransform/implicit_return_func_binaryoperation_args.swift

@@ -9,8 +9,6 @@
 // RUN: %target-run %t/main2 | %FileCheck %s
 // REQUIRES: executable_test
 
-// XFAIL: noncopyable_generics
-
 import PlaygroundSupport
 
 func add<I : SignedNumeric>(_ lhs: I, _ rhs: I) -> I {

test/PlaygroundTransform/implicit_return_func_is.swift

@@ -9,8 +9,6 @@
 // RUN: %target-run %t/main2 | %FileCheck %s
 // REQUIRES: executable_test
 
-// XFAIL: noncopyable_generics
-
 import PlaygroundSupport
 
 func iss<T>(_ instance: Any, anInstanceOf type: T.Type) -> Bool {