---

swift-ci · swift-ci · commit 6566d2cb67c3 · 2019-06-19T19:58:14.000-07:00
yaml --- r: 323323 b: refs/heads/tensorflow-next c: 6676c35 h: refs/heads/master i: 323321: 23e325c 323319: 1a72aef
diff --git a/[refs] b/[refs]
@@ -1461,4 +1461,4 @@ refs/heads/master-rebranch: 86e95c23aa0d37f24ec138b7853146c1cead2e40
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec
-refs/heads/tensorflow-next: db2f45ec3482787b55b3a74a2244b35df069e95e
+refs/heads/tensorflow-next: 6676c3533c95ede16aaa0b1369ff0375682051a5
diff --git a/branches/tensorflow-next/include/swift/AST/Types.h b/branches/tensorflow-next/include/swift/AST/Types.h
@@ -5606,6 +5606,7 @@ inline bool TypeBase::hasSimpleTypeRepr() const {
   case TypeKind::NestedArchetype:
     return cast<NestedArchetypeType>(this)->getParent()->hasSimpleTypeRepr();
       
+  case TypeKind::OpaqueTypeArchetype:
   case TypeKind::OpenedArchetype:
     return false;
 
diff --git a/branches/tensorflow-next/lib/AST/ASTPrinter.cpp b/branches/tensorflow-next/lib/AST/ASTPrinter.cpp
@@ -3456,7 +3456,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
     }
 
     bool isSimple = T->hasSimpleTypeRepr();
-    if (isSimple && T->is<OpaqueTypeArchetypeType>()) {
+    if (!isSimple && T->is<OpaqueTypeArchetypeType>()) {
       auto opaqueTy = T->castTo<OpaqueTypeArchetypeType>();
       switch (Options.OpaqueReturnTypePrinting) {
       case PrintOptions::OpaqueReturnTypePrintingMode::StableReference:

Original file line number	Diff line number	Diff line change
`@@ -3456,7 +3456,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {`
`3456`	`3456`	`}`
`3457`	`3457`
`3458`	`3458`	`bool isSimple = T->hasSimpleTypeRepr();`
`3459`		`- if (isSimple && T->is<OpaqueTypeArchetypeType>()) {`
	`3459`	`+ if (!isSimple && T->is<OpaqueTypeArchetypeType>()) {`
`3460`	`3460`	`auto opaqueTy = T->castTo<OpaqueTypeArchetypeType>();`
`3461`	`3461`	`switch (Options.OpaqueReturnTypePrinting) {`
`3462`	`3462`	`case PrintOptions::OpaqueReturnTypePrintingMode::StableReference:`