merge fixup

Author: jckarter

include/swift/AST/Expr.h

@@ -2870,40 +2870,6 @@ class UnderlyingToOpaqueExpr : public ImplicitConversionExpr {
   }
 };
 
-/// TupleShuffleExpr - This represents a permutation of a tuple value to a new
-/// tuple type.
-class TupleShuffleExpr final : public ImplicitConversionExpr,
-    private llvm::TrailingObjects<TupleShuffleExpr, unsigned> {
-  friend TrailingObjects;
-
-  size_t numTrailingObjects(OverloadToken<unsigned>) const {
-    return Bits.TupleShuffleExpr.NumElementMappings;
-  }
-
-private:
-  TupleShuffleExpr(Expr *subExpr, ArrayRef<unsigned> elementMapping,
-                   Type ty)
-    : ImplicitConversionExpr(ExprKind::TupleShuffle, subExpr, ty) {
-    Bits.TupleShuffleExpr.NumElementMappings = elementMapping.size();
-    std::uninitialized_copy(elementMapping.begin(), elementMapping.end(),
-                            getTrailingObjects<unsigned>());
-  }
-
-public:
-  static TupleShuffleExpr *create(ASTContext &ctx, Expr *subExpr,
-                                  ArrayRef<unsigned> elementMapping,
-                                  Type ty);
-
-  ArrayRef<unsigned> getElementMapping() const {
-    return {getTrailingObjects<unsigned>(),
-            static_cast<size_t>(Bits.TupleShuffleExpr.NumElementMappings)};
-  }
-
-  static bool classof(const Expr *E) {
-    return E->getKind() == ExprKind::TupleShuffle;
-  }
-};
-
 /// DestructureTupleExpr - Destructure a tuple value produced by a source
 /// expression, binding the elements to OpaqueValueExprs, then evaluate the
 /// result expression written in terms of the OpaqueValueExprs.

include/swift/AST/TypeRepr.h

@@ -1020,8 +1020,8 @@ class SILBoxTypeReprField {
 /// should be abstracted from callers, given a set of generic constraints that
 /// the concrete return type satisfies:
 ///
-/// func foo() -> opaque Collection { return [1,2,3] }
-/// var bar: opaque SignedInteger = 1
+/// func foo() -> some Collection { return [1,2,3] }
+/// var bar: some SignedInteger = 1
 ///
 /// It is currently illegal for this to appear in any other position.
 class OpaqueReturnTypeRepr : public TypeRepr {

lib/SILGen/SILGenConvert.cpp

@@ -776,7 +776,6 @@ ManagedValue SILGenFunction::emitExistentialErasure(
     auto upcast =
       B.createInitExistentialMetatype(loc, metatype,
                       existentialTL.getLoweredType(),
-                      cast<MetatypeType>(concreteFormalType).getInstanceType(),
                       conformances);
     return ManagedValue::forUnmanaged(upcast);
   }

lib/SILGen/SILGenFunction.cpp

@@ -510,7 +510,7 @@ void SILGenFunction::emitArtificialTopLevel(ClassDecl *mainClass) {
                              SILType::getPrimitiveObjectType(mainClassMetaty));
     metaTy = B.createInitExistentialMetatype(mainClass, metaTy,
                           SILType::getPrimitiveObjectType(anyObjectMetaTy),
-                          mainClassTy, {});
+                          {});
     SILValue optNameValue = B.createApply(
         mainClass, NSStringFromClass, NSStringFromClass->getType(),
         SILType::getPrimitiveObjectType(OptNSStringTy), {}, metaTy);

lib/SILGen/SILGenLValue.cpp

@@ -949,7 +949,6 @@ namespace {
                 loc,
                 payload,
                 base.getType().getObjectType(),
-                OpenedArchetype,
                 SGF.getASTContext().AllocateCopy(conformances));
       } else {
         assert(getSubstFormalType()->isBridgeableObjectType());

lib/Sema/TypeCheckAccess.cpp

@@ -1666,6 +1666,7 @@ class ExportabilityChecker : public DeclVisitor<ExportabilityChecker> {
   UNINTERESTING(EnumCase) // Handled at the EnumElement level.
   UNINTERESTING(Destructor) // Always correct.
   UNINTERESTING(Accessor) // Handled by the Var or Subscript.
+  UNINTERESTING(OpaqueType) // TODO
 
   // Handled at the PatternBinding level; if the pattern has a simple
   // "name: TheType" form, we can get better results by diagnosing the TypeRepr.

lib/Serialization/Deserialization.cpp

@@ -3037,6 +3037,8 @@ class swift::DeclDeserializer {
                    MF.getDeclContext(contextID),
                    MF.getGenericSignature(interfaceSigID),
                    MF.getType(interfaceTypeID)->castTo<GenericTypeParamType>());
+    declOrOffset = opaqueDecl;
+
     auto genericEnv = MF.getGenericEnvironment(genericEnvID);
     opaqueDecl->setGenericEnvironment(genericEnv);
     if (underlyingTypeID)
@@ -3049,7 +3051,6 @@ class swift::DeclDeserializer {
     auto opaqueTy = OpaqueTypeArchetypeType::get(opaqueDecl, subs);
     auto metatype = MetatypeType::get(opaqueTy);
     opaqueDecl->setInterfaceType(metatype);
-    
     return opaqueDecl;
   }
 

test/ParseableInterface/opaque-result-types.swift

@@ -16,7 +16,7 @@ public func foo(_: Int) -> some Foo {
   return 679
 }
 
-// CHECK-LABEL: public func foo<T>(_ x: T) -> some Foo where T : Foo
+// CHECK-LABEL: public func foo<T>(_ x: T) -> some Foo where T : OpaqueResultTypes.Foo
 public func foo<T: Foo>(_ x: T) -> some Foo {
   return x
 }
@@ -39,7 +39,7 @@ public struct Bar<T>: AssocTypeInference {
     return 219
   }
 
-  // CHECK-LABEL: public func foo<U>(_ x: U) -> some Foo where U : Foo
+  // CHECK-LABEL: public func foo<U>(_ x: U) -> some Foo where U : OpaqueResultTypes.Foo
   public func foo<U: Foo>(_ x: U) -> some Foo {
     return x
   }
@@ -56,7 +56,7 @@ public struct Bar<T>: AssocTypeInference {
       return 219
     }
 
-    // CHECK-LABEL: public func foo<U>(_ x: U) -> some Foo where U : Foo
+    // CHECK-LABEL: public func foo<U>(_ x: U) -> some Foo where U : OpaqueResultTypes.Foo
     public func foo<U: Foo>(_ x: U) -> some Foo {
       return x
     }
@@ -81,7 +81,7 @@ public struct Bar<T>: AssocTypeInference {
       return x
     }
 
-    // CHECK-LABEL: public func foo<V>(_ x: V) -> some Foo where V : Foo
+    // CHECK-LABEL: public func foo<V>(_ x: V) -> some Foo where V : OpaqueResultTypes.Foo
     public func foo<V: Foo>(_ x: V) -> some Foo {
       return x
     }
@@ -103,7 +103,7 @@ public struct Zim: AssocTypeInference {
     return 219
   }
 
-  // CHECK-LABEL: public func foo<U>(_ x: U) -> some Foo where U : Foo
+  // CHECK-LABEL: public func foo<U>(_ x: U) -> some Foo where U : OpaqueResultTypes.Foo
   public func foo<U: Foo>(_ x: U) -> some Foo {
     return x
   }
@@ -119,7 +119,7 @@ public struct Zim: AssocTypeInference {
       return 219
     }
 
-    // CHECK-LABEL: public func foo<U>(_ x: U) -> some Foo where U : Foo
+    // CHECK-LABEL: public func foo<U>(_ x: U) -> some Foo where U : OpaqueResultTypes.Foo
     public func foo<U: Foo>(_ x: U) -> some Foo {
       return x
     }
@@ -141,7 +141,7 @@ public struct Zim: AssocTypeInference {
       return x
     }
 
-    // CHECK-LABEL: public func foo<V>(_ x: V) -> some Foo where V : Foo
+    // CHECK-LABEL: public func foo<V>(_ x: V) -> some Foo where V : OpaqueResultTypes.Foo
     public func foo<V: Foo>(_ x: V) -> some Foo {
       return x
     }