Merge pull request #19731 from slavapestov/stray-commits

Couple of stray fixes I forgot to check in

Author: slavapestov

lib/AST/SubstitutionMap.cpp

@@ -108,23 +108,23 @@ bool SubstitutionMap::hasAnySubstitutableParams() const {
 }
 
 bool SubstitutionMap::hasArchetypes() const {
-  for (Type replacementTy : getReplacementTypes()) {
+  for (Type replacementTy : getReplacementTypesBuffer()) {
     if (replacementTy && replacementTy->hasArchetype())
       return true;
   }
   return false;
 }
 
 bool SubstitutionMap::hasOpenedExistential() const {
-  for (Type replacementTy : getReplacementTypes()) {
+  for (Type replacementTy : getReplacementTypesBuffer()) {
     if (replacementTy && replacementTy->hasOpenedExistential())
       return true;
   }
   return false;
 }
 
 bool SubstitutionMap::hasDynamicSelf() const {
-  for (Type replacementTy : getReplacementTypes()) {
+  for (Type replacementTy : getReplacementTypesBuffer()) {
     if (replacementTy && replacementTy->hasDynamicSelfType())
       return true;
   }
@@ -136,7 +136,7 @@ bool SubstitutionMap::isCanonical() const {
 
   if (!getGenericSignature()->isCanonical()) return false;
 
-  for (Type replacementTy : getReplacementTypes()) {
+  for (Type replacementTy : getReplacementTypesBuffer()) {
     if (replacementTy && !replacementTy->isCanonical())
       return false;
   }
@@ -154,7 +154,7 @@ SubstitutionMap SubstitutionMap::getCanonical() const {
 
   auto canonicalSig = getGenericSignature()->getCanonicalSignature();
   SmallVector<Type, 4> replacementTypes;
-  for (Type replacementType : getReplacementTypes()) {
+  for (Type replacementType : getReplacementTypesBuffer()) {
     if (replacementType)
       replacementTypes.push_back(replacementType->getCanonicalType());
     else

test/decl/protocol/conforms/init.swift

@@ -76,3 +76,14 @@ class Foo : P2 {
     self.value = value
   }
 }
+
+
+// This used to produce a bogus diagnostic with an unknown location
+class Base : P1 {}
+// expected-error@-1 {{initializer requirement 'init()' can only be satisfied by a 'required' initializer in non-final class 'Base'}}
+
+class Middle : Base {
+  init(i: Int) {}
+}
+
+class Derived : Middle {}