Merge remote-tracking branch 'origin/master' into master-next

swift-ci · swift-ci · commit 6676c3533c95 · 2019-06-19T19:58:14.000-07:00
diff --git a/include/swift/AST/Types.h b/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/lib/AST/ASTPrinter.cpp b/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:`