---

yaml
---
r: 347711
b: refs/heads/master
c: ef47142
h: refs/heads/master
i:
  347709: e26d800
  347707: 7c7bc47
  347703: 25b8e11
  347695: 0c5f731
  347679: 16e2361
  347647: fed6594

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 267d32cb2d9c3c5c98b7403e79b6978a1585c7a5
+refs/heads/master: ef47142518d383df3a8e6e12c436c4118e25d504
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/AST/GenericSignature.h

@@ -312,6 +312,12 @@ class alignas(1 << TypeAlignInBits) GenericSignature final
   /// generic parameters to themselves.
   SubstitutionMap getIdentitySubstitutionMap() const;
 
+  /// Whether this generic signature involves a type variable.
+  bool hasTypeVariable() const;
+
+  /// Whether the given set of requirements involves a type variable.
+  static bool hasTypeVariable(ArrayRef<Requirement> requirements);
+
   static void Profile(llvm::FoldingSetNodeID &ID,
                       TypeArrayView<GenericTypeParamType> genericParams,
                       ArrayRef<Requirement> requirements);

trunk/lib/AST/ASTContext.cpp

@@ -245,16 +245,6 @@ FOR_KNOWN_FOUNDATION_TYPES(CACHE_FOUNDATION_DECL)
   /// Stores information about lazy deserialization of various declarations.
   llvm::DenseMap<const DeclContext *, LazyContextData *> LazyContexts;
 
-  /// Stored generic signature builders for canonical generic signatures.
-  llvm::DenseMap<GenericSignature *, std::unique_ptr<GenericSignatureBuilder>>
-    GenericSignatureBuilders;
-
-  /// Canonical generic environments for canonical generic signatures.
-  ///
-  /// The keys are the generic signature builders in \c GenericSignatureBuilders.
-  llvm::DenseMap<GenericSignatureBuilder *, GenericEnvironment *>
-    CanonicalGenericEnvironments;
-  
   /// The single-parameter generic signature with no constraints, <T>.
   CanGenericSignature SingleGenericParameterSignature;
 
@@ -327,6 +317,19 @@ FOR_KNOWN_FOUNDATION_TYPES(CACHE_FOUNDATION_DECL)
     llvm::FoldingSet<LayoutConstraintInfo> LayoutConstraints;
     llvm::FoldingSet<OpaqueTypeArchetypeType> OpaqueArchetypes;
 
+    llvm::FoldingSet<GenericSignature> GenericSignatures;
+
+    /// Stored generic signature builders for canonical generic signatures.
+    llvm::DenseMap<GenericSignature *, std::unique_ptr<GenericSignatureBuilder>>
+      GenericSignatureBuilders;
+
+    /// Canonical generic environments for canonical generic signatures.
+    ///
+    /// The keys are the generic signature builders in
+    /// \c GenericSignatureBuilders.
+    llvm::DenseMap<GenericSignatureBuilder *, GenericEnvironment *>
+      CanonicalGenericEnvironments;
+
     /// The set of function types.
     llvm::FoldingSet<FunctionType> FunctionTypes;
 
@@ -377,7 +380,6 @@ FOR_KNOWN_FOUNDATION_TYPES(CACHE_FOUNDATION_DECL)
   llvm::FoldingSet<SILBoxType> SILBoxTypes;
   llvm::DenseMap<BuiltinIntegerWidth, BuiltinIntegerType*> IntegerTypes;
   llvm::FoldingSet<BuiltinVectorType> BuiltinVectorTypes;
-  llvm::FoldingSet<GenericSignature> GenericSignatures;
   llvm::FoldingSet<DeclName::CompoundDeclName> CompoundNames;
   llvm::DenseMap<UUID, OpenedArchetypeType *> OpenedExistentialArchetypes;
 
@@ -1427,34 +1429,50 @@ void ASTContext::getVisibleTopLevelClangModules(
     collectAllModules(Modules);
 }
 
+static AllocationArena getArena(GenericSignature *genericSig) {
+  if (!genericSig)
+    return AllocationArena::Permanent;
+
+  if (genericSig->hasTypeVariable())
+    return AllocationArena::ConstraintSolver;
+
+  return AllocationArena::Permanent;
+}
+
 void ASTContext::registerGenericSignatureBuilder(
                                        GenericSignature *sig,
                                        GenericSignatureBuilder &&builder) {
   auto canSig = sig->getCanonicalSignature();
-  auto known = getImpl().GenericSignatureBuilders.find(canSig);
-  if (known != getImpl().GenericSignatureBuilders.end()) {
+  auto arena = getArena(sig);
+  auto &genericSignatureBuilders =
+      getImpl().getArena(arena).GenericSignatureBuilders;
+  auto known = genericSignatureBuilders.find(canSig);
+  if (known != genericSignatureBuilders.end()) {
     ++NumRegisteredGenericSignatureBuildersAlready;
     return;
   }
 
   ++NumRegisteredGenericSignatureBuilders;
-  getImpl().GenericSignatureBuilders[canSig] =
+  genericSignatureBuilders[canSig] =
     llvm::make_unique<GenericSignatureBuilder>(std::move(builder));
 }
 
 GenericSignatureBuilder *ASTContext::getOrCreateGenericSignatureBuilder(
                                                       CanGenericSignature sig) {
   // Check whether we already have a generic signature builder for this
   // signature and module.
-  auto known = getImpl().GenericSignatureBuilders.find(sig);
-  if (known != getImpl().GenericSignatureBuilders.end())
+  auto arena = getArena(sig);
+  auto &genericSignatureBuilders =
+      getImpl().getArena(arena).GenericSignatureBuilders;
+  auto known = genericSignatureBuilders.find(sig);
+  if (known != genericSignatureBuilders.end())
     return known->second.get();
 
   // Create a new generic signature builder with the given signature.
   auto builder = new GenericSignatureBuilder(*this);
 
   // Store this generic signature builder (no generic environment yet).
-  getImpl().GenericSignatureBuilders[sig] =
+  genericSignatureBuilders[sig] =
     std::unique_ptr<GenericSignatureBuilder>(builder);
 
   builder->addGenericSignature(sig);
@@ -1525,12 +1543,16 @@ GenericSignatureBuilder *ASTContext::getOrCreateGenericSignatureBuilder(
 GenericEnvironment *ASTContext::getOrCreateCanonicalGenericEnvironment(
                                               GenericSignatureBuilder *builder,
                                               GenericSignature *sig) {
-  auto known = getImpl().CanonicalGenericEnvironments.find(builder);
-  if (known != getImpl().CanonicalGenericEnvironments.end())
+  auto arena = getArena(sig);
+  auto &canonicalGenericEnvironments =
+      getImpl().getArena(arena).CanonicalGenericEnvironments;
+
+  auto known = canonicalGenericEnvironments.find(builder);
+  if (known != canonicalGenericEnvironments.end())
     return known->second;
 
   auto env = sig->createGenericEnvironment();
-  getImpl().CanonicalGenericEnvironments[builder] = env;
+  canonicalGenericEnvironments[builder] = env;
   return env;
 }
 
@@ -3774,10 +3796,14 @@ GenericSignature::get(TypeArrayView<GenericTypeParamType> params,
   llvm::FoldingSetNodeID ID;
   GenericSignature::Profile(ID, params, requirements);
 
+  auto arena = GenericSignature::hasTypeVariable(requirements)
+      ? AllocationArena::ConstraintSolver
+      : AllocationArena::Permanent;
+
   auto &ctx = getASTContext(params, requirements);
   void *insertPos;
-  if (auto *sig = ctx.getImpl().GenericSignatures.FindNodeOrInsertPos(ID,
-                                                                 insertPos)) {
+  if (auto *sig = ctx.getImpl().getArena(arena).GenericSignatures
+          .FindNodeOrInsertPos(ID, insertPos)) {
     if (isKnownCanonical)
       sig->CanonicalSignatureOrASTContext = &ctx;
 
@@ -3790,7 +3816,7 @@ GenericSignature::get(TypeArrayView<GenericTypeParamType> params,
   void *mem = ctx.Allocate(bytes, alignof(GenericSignature));
   auto newSig = new (mem) GenericSignature(params, requirements,
                                            isKnownCanonical);
-  ctx.getImpl().GenericSignatures.InsertNode(newSig, insertPos);
+  ctx.getImpl().getArena(arena).GenericSignatures.InsertNode(newSig, insertPos);
   return newSig;
 }
 

trunk/lib/AST/GenericSignature.cpp

@@ -1042,3 +1042,28 @@ unsigned GenericSignature::getGenericParamOrdinal(GenericTypeParamType *param) {
     .findIndexIn(getGenericParams());
 }
 
+bool GenericSignature::hasTypeVariable() const {
+  return hasTypeVariable(getRequirements());
+}
+
+bool GenericSignature::hasTypeVariable(ArrayRef<Requirement> requirements) {
+  for (const auto &req : requirements) {
+    if (req.getFirstType()->hasTypeVariable())
+      return true;
+
+    switch (req.getKind()) {
+    case RequirementKind::Layout:
+      break;
+
+    case RequirementKind::Conformance:
+    case RequirementKind::SameType:
+    case RequirementKind::Superclass:
+      if (req.getSecondType()->hasTypeVariable())
+        return true;
+      break;
+    }
+  }
+
+  return false;
+}
+

trunk/lib/AST/GenericSignatureBuilder.cpp

@@ -5404,9 +5404,15 @@ namespace {
                             ArrayRef<Constraint<T>> constraints,
                             llvm::function_ref<bool(const Constraint<T> &)>
                                                    isSuitableRepresentative) {
+    Optional<Constraint<T>> fallbackConstraint;
+
     // Find a representative constraint.
     Optional<Constraint<T>> representativeConstraint;
     for (const auto &constraint : constraints) {
+      // Make sure we have a constraint to fall back on.
+      if (!fallbackConstraint)
+        fallbackConstraint = constraint;
+
       // If this isn't a suitable representative constraint, ignore it.
       if (!isSuitableRepresentative(constraint))
         continue;
@@ -5457,7 +5463,8 @@ namespace {
         representativeConstraint = constraint;
     }
 
-    return representativeConstraint;
+    return representativeConstraint ? representativeConstraint
+                                    : fallbackConstraint;
   }
 } // end anonymous namespace
 
@@ -6996,9 +7003,11 @@ void GenericSignatureBuilder::checkConcreteTypeConstraints(
       if (concreteType->isEqual(equivClass->concreteType))
         return ConstraintRelation::Redundant;
 
-      // If either has a type parameter, call them unrelated.
+      // If either has a type parameter or type variable, call them unrelated.
       if (concreteType->hasTypeParameter() ||
-          equivClass->concreteType->hasTypeParameter())
+          equivClass->concreteType->hasTypeParameter() ||
+          concreteType->hasTypeVariable() ||
+          equivClass->concreteType->hasTypeVariable())
         return ConstraintRelation::Unrelated;
 
       return ConstraintRelation::Conflicting;

trunk/lib/IRGen/GenStruct.cpp

@@ -885,7 +885,10 @@ void IRGenModule::maybeEmitOpaqueTypeDecl(OpaqueTypeDecl *opaque) {
     // then emit all opaque type descriptors and make them runtime-discoverable
     // so that remote ast/mirror can recover them.
     addRuntimeResolvableType(opaque);
-    emitOpaqueTypeDecl(opaque);
+    if (IRGen.hasLazyMetadata(opaque))
+      IRGen.noteUseOfOpaqueTypeDescriptor(opaque);
+    else
+      emitOpaqueTypeDecl(opaque);
   } else if (!IRGen.hasLazyMetadata(opaque)) {
     emitOpaqueTypeDecl(opaque);
   }

trunk/test/Parse/ConditionalCompilation/arm64AppleTVOSTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target arm64-apple-tvos9.0 -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target arm64-apple-tvos9.0 -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target arm64-apple-tvos9.0
 
 #if os(iOS)

trunk/test/Parse/ConditionalCompilation/arm64IOSTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target arm64-apple-ios7.0 -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target arm64-apple-ios7.0 -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target arm64-apple-ios7.0
 
 #if os(tvOS) || os(watchOS)

trunk/test/Parse/ConditionalCompilation/armAndroidTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target armv7-none-linux-androideabi -disable-objc-interop -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target armv7-none-linux-androideabi -disable-objc-interop -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target armv7-none-linux-androideabi
 
 #if os(Linux)

trunk/test/Parse/ConditionalCompilation/armIOSTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target arm-apple-ios7.0 -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target arm-apple-ios7.0 -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target arm-apple-ios7.0
 
 #if os(tvOS) || os(watchOS)

trunk/test/Parse/ConditionalCompilation/armWatchOSTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target arm-apple-watchos2.0 -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target arm-apple-watchos2.0 -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target arm-apple-watchos2.0
 
 #if os(iOS)

trunk/test/Parse/ConditionalCompilation/i386AppleTVOSTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target i386-apple-tvos9.0 -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target i386-apple-tvos9.0 -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target i386-apple-tvos9.0
 
 #if os(iOS)

trunk/test/Parse/ConditionalCompilation/i386IOSTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target i386-apple-ios7.0 -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target i386-apple-ios7.0 -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target i386-apple-ios7.0
 
 #if os(tvOS) || os(watchOS)

trunk/test/Parse/ConditionalCompilation/i386WatchOSTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target i386-apple-watchos2.0 -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target i386-apple-watchos2.0 -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target i386-apple-watchos2.0
 
 #if os(iOS)

trunk/test/Parse/ConditionalCompilation/powerpc64LinuxTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target powerpc64-unknown-linux-gnu -disable-objc-interop -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target powerpc64-unknown-linux-gnu -disable-objc-interop -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target powerpc64-unknown-linux-gnu
 
 #if arch(powerpc64) && os(Linux) && _runtime(_Native) && _endian(big)

trunk/test/Parse/ConditionalCompilation/powerpc64leLinuxTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target powerpc64le-unknown-linux-gnu -disable-objc-interop -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target powerpc64le-unknown-linux-gnu -disable-objc-interop -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target powerpc64le-unknown-linux-gnu
 
 #if arch(powerpc64le) && os(Linux) && _runtime(_Native) && _endian(little)

trunk/test/Parse/ConditionalCompilation/s390xLinuxTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target s390x-unknown-linux-gnu -disable-objc-interop -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target s390x-unknown-linux-gnu -disable-objc-interop -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target s390x-unknown-linux-gnu
 
 #if arch(s390x) && os(Linux) && _runtime(_Native) && _endian(big)

trunk/test/Parse/ConditionalCompilation/trailingClosureOnTargetConfig.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAZ -target x86_64-apple-macosx10.9 -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target x86_64-apple-macosx10.9 -parse-stdlib
 
 struct Foo {}
 

trunk/test/Parse/ConditionalCompilation/x64AppleTVOSTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target x86_64-apple-tvos9.0 -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target x86_64-apple-tvos9.0 -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target x86_64-apple-tvos9.0
 
 #if os(iOS)

trunk/test/Parse/ConditionalCompilation/x64CygwinTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target x86_64-unknown-windows-cygnus -disable-objc-interop -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target x86_64-unknown-windows-cygnus -disable-objc-interop -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target x86_64-unknown-windows-cygnus
 
 #if arch(x86_64) && os(Cygwin) && _runtime(_Native) && _endian(little)

trunk/test/Parse/ConditionalCompilation/x64FreeBSDTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target x86_64-unknown-freebsd10 -disable-objc-interop -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target x86_64-unknown-freebsd10 -disable-objc-interop -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target x86_64-unknown-freebsd10
 
 #if arch(x86_64) && os(FreeBSD) && _runtime(_Native) && _endian(little)

trunk/test/Parse/ConditionalCompilation/x64IOSTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target x86_64-apple-ios7.0 -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target x86_64-apple-ios7.0 -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target x86_64-apple-ios7.0
 
 #if os(tvOS) || os(watchOS)

trunk/test/Parse/ConditionalCompilation/x64LinuxTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target x86_64-unknown-linux-gnu -disable-objc-interop -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target x86_64-unknown-linux-gnu -disable-objc-interop -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target x86_64-unknown-linux-gnu
 
 #if arch(x86_64) && os(Linux) && _runtime(_Native) && _endian(little)

trunk/test/Parse/ConditionalCompilation/x64OSXTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target x86_64-apple-macosx10.9 -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target x86_64-apple-macosx10.9 -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target x86_64-apple-macosx10.9
 
 #if arch(x86_64) && os(OSX) && _runtime(_ObjC) && _endian(little)

trunk/test/Parse/ConditionalCompilation/x64WindowsTarget.swift

@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck %s -verify -D FOO -D BAR -target x86_64-unknown-windows-msvc -disable-objc-interop -D FOO -parse-stdlib
+// RUN: %swift -typecheck %s -verify -target x86_64-unknown-windows-msvc -disable-objc-interop -parse-stdlib
 // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target x86_64-unknown-windows-msvc
 
 #if arch(x86_64) && os(Windows) && _runtime(_Native) && _endian(little)

trunk/validation-test/compiler_crashers_2_fixed/0194-rdar50309503.swift

@@ -0,0 +1,14 @@
+// RUN: %target-swift-frontend -emit-ir -o /dev/null %s
+
+protocol P {
+  associatedtype AT
+  func foo() -> AT
+}
+
+struct X<C1: Collection, C2: Collection, T>: P
+    where C1.Element == C2.Element
+{
+  func foo() -> some P {
+    return self
+  }
+}