Merge pull request #7346 from slavapestov/misc-gardening

slavapestov · web-flow · commit 365219086629 · 2017-02-08T20:00:23.000-08:00
Add a couple of regression tests and make a small cleanup
diff --git a/include/swift/AST/ProtocolConformance.h b/include/swift/AST/ProtocolConformance.h
@@ -18,7 +18,6 @@
 
 #include "swift/AST/ConcreteDeclRef.h"
 #include "swift/AST/Decl.h"
-#include "swift/AST/ProtocolConformanceRef.h"
 #include "swift/AST/Substitution.h"
 #include "swift/AST/Type.h"
 #include "swift/AST/Types.h"
@@ -160,12 +159,6 @@ class alignas(1 << DeclAlignInBits) ProtocolConformance {
   getTypeWitnessSubstAndDecl(AssociatedTypeDecl *assocType,
                              LazyResolver *resolver) const;
 
-  static Type
-  getTypeWitnessByName(Type type,
-                       ProtocolConformanceRef conformance,
-                       Identifier name,
-                       LazyResolver *resolver);
-
   /// Apply the given function object to each type witness within this
   /// protocol conformance.
   ///
diff --git a/include/swift/AST/ProtocolConformanceRef.h b/include/swift/AST/ProtocolConformanceRef.h
@@ -19,6 +19,7 @@
 #include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/PointerUnion.h"
 #include "swift/AST/TypeAlignments.h"
+#include "swift/AST/Type.h"
 
 namespace llvm {
   class raw_ostream;
@@ -101,6 +102,12 @@ class ProtocolConformanceRef {
   friend llvm::hash_code hash_value(ProtocolConformanceRef conformance) {
     return llvm::hash_value(conformance.Union.getOpaqueValue());
   }
+
+  static Type
+  getTypeWitnessByName(Type type,
+                       ProtocolConformanceRef conformance,
+                       Identifier name,
+                       LazyResolver *resolver);
 };
 
 } // end namespace swift
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
@@ -3848,7 +3848,7 @@ Type ASTContext::getBridgedToObjC(const DeclContext *dc, Type type,
 
     // Find the Objective-C class type we bridge to.
     if (conformance->isConcrete()) {
-      return ProtocolConformance::getTypeWitnessByName(
+      return ProtocolConformanceRef::getTypeWitnessByName(
                type, *conformance, Id_ObjectiveCType,
                getLazyResolver());
     } else {
diff --git a/lib/AST/ProtocolConformance.cpp b/lib/AST/ProtocolConformance.cpp
@@ -94,6 +94,40 @@ ProtocolConformanceRef::getInherited(ProtocolDecl *parent) const {
   llvm_unreachable("unhandled ProtocolConformanceRef");
 }
 
+Type
+ProtocolConformanceRef::getTypeWitnessByName(Type type,
+                                             ProtocolConformanceRef conformance,
+                                             Identifier name,
+                                             LazyResolver *resolver) {
+  // For an archetype, retrieve the nested type with the appropriate
+  // name. There are no conformance tables.
+  if (auto archetype = type->getAs<ArchetypeType>()) {
+    return archetype->getNestedType(name);
+  }
+
+  // Find the named requirement.
+  AssociatedTypeDecl *assocType = nullptr;
+  auto members = conformance.getRequirement()->lookupDirect(name);
+  for (auto member : members) {
+    assocType = dyn_cast<AssociatedTypeDecl>(member);
+    if (assocType)
+      break;
+  }
+
+  // FIXME: Shouldn't this be a hard error?
+  if (!assocType)
+    return nullptr;
+
+  if (conformance.isAbstract())
+    return DependentMemberType::get(type, assocType);
+
+  auto concrete = conformance.getConcrete();
+  if (!concrete->hasTypeWitness(assocType, resolver)) {
+    return nullptr;
+  }
+  return concrete->getTypeWitness(assocType, resolver).getReplacement();
+}
+
 void *ProtocolConformance::operator new(size_t bytes, ASTContext &context,
                                         AllocationArena arena,
                                         unsigned alignment) {
@@ -154,40 +188,6 @@ ProtocolConformance::getTypeWitness(AssociatedTypeDecl *assocType,
   return getTypeWitnessSubstAndDecl(assocType, resolver).first;
 }
 
-Type
-ProtocolConformance::getTypeWitnessByName(Type type,
-                                          ProtocolConformanceRef conformance,
-                                          Identifier name,
-                                          LazyResolver *resolver) {
-  // For an archetype, retrieve the nested type with the appropriate
-  // name. There are no conformance tables.
-  if (auto archetype = type->getAs<ArchetypeType>()) {
-    return archetype->getNestedType(name);
-  }
-
-  // Find the named requirement.
-  AssociatedTypeDecl *assocType = nullptr;
-  auto members = conformance.getRequirement()->lookupDirect(name);
-  for (auto member : members) {
-    assocType = dyn_cast<AssociatedTypeDecl>(member);
-    if (assocType)
-      break;
-  }
-
-  // FIXME: Shouldn't this be a hard error?
-  if (!assocType)
-    return nullptr;
-
-  if (conformance.isAbstract())
-    return DependentMemberType::get(type, assocType);
-
-  auto concrete = conformance.getConcrete();
-  if (!concrete->hasTypeWitness(assocType, resolver)) {
-    return nullptr;
-  }
-  return concrete->getTypeWitness(assocType, resolver).getReplacement();
-}
-
 Witness ProtocolConformance::getWitness(ValueDecl *requirement,
                                         LazyResolver *resolver) const {
   CONFORMANCE_SUBCLASS_DISPATCH(getWitness, (requirement, resolver))
diff --git a/lib/PrintAsObjC/PrintAsObjC.cpp b/lib/PrintAsObjC/PrintAsObjC.cpp
@@ -1101,7 +1101,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
 
     // Dig out the Objective-C type.
     auto conformance = conformances.front();
-    Type objcType = ProtocolConformance::getTypeWitnessByName(
+    Type objcType = ProtocolConformanceRef::getTypeWitnessByName(
                       nominal->getDeclaredType(),
                       ProtocolConformanceRef(conformance),
                       ctx.Id_ObjectiveCType,
diff --git a/lib/SIL/Bridging.cpp b/lib/SIL/Bridging.cpp
@@ -225,7 +225,7 @@ Type TypeConverter::getLoweredCBridgedType(AbstractionPattern pattern,
     auto conformance = foreignRepresentation.second;
     assert(conformance && "Missing conformance?");
     Type bridgedTy =
-      ProtocolConformance::getTypeWitnessByName(
+      ProtocolConformanceRef::getTypeWitnessByName(
         t, ProtocolConformanceRef(conformance),
         M.getASTContext().Id_ObjectiveCType,
         nullptr);
diff --git a/lib/Sema/CSDiag.cpp b/lib/Sema/CSDiag.cpp
@@ -3686,10 +3686,11 @@ static Type isRawRepresentable(Type fromType,
   if (!conformance)
     return Type();
 
-  Type rawTy = ProtocolConformance::getTypeWitnessByName(fromType,
-                                                         *conformance,
-                                              CS->getASTContext().Id_RawValue,
-                                                         &CS->TC);
+  Type rawTy = ProtocolConformanceRef::getTypeWitnessByName(
+      fromType,
+      *conformance,
+      CS->getASTContext().Id_RawValue,
+      &CS->TC);
   return rawTy;
 }
 
@@ -4056,9 +4057,9 @@ bool FailureDiagnosis::diagnoseContextualConversionError() {
                                   ConformanceCheckFlags::InExpression)) {
         Type errorCodeType = expr->getType();
         Type errorType =
-          ProtocolConformance::getTypeWitnessByName(errorCodeType, *conformance,
-                                                    TC.Context.Id_ErrorType,
-                                                    &TC)->getCanonicalType();
+          ProtocolConformanceRef::getTypeWitnessByName(errorCodeType, *conformance,
+                                                       TC.Context.Id_ErrorType,
+                                                       &TC)->getCanonicalType();
         if (errorType) {
           auto diag = diagnose(expr->getLoc(), diag::cannot_throw_error_code,
                                errorCodeType, errorType);
@@ -6698,12 +6699,12 @@ bool FailureDiagnosis::visitArrayExpr(ArrayExpr *E) {
       return true;
     }
 
-    contextualElementType = ProtocolConformance::getTypeWitnessByName(
-                                                 contextualType,
-                                                 *Conformance,
-                                                 CS->getASTContext().Id_Element,
-                                                 &CS->TC)
-                              ->getDesugaredType();
+    contextualElementType = ProtocolConformanceRef::getTypeWitnessByName(
+        contextualType,
+        *Conformance,
+        CS->getASTContext().Id_Element,
+        &CS->TC)
+      ->getDesugaredType();
     elementTypePurpose = CTP_ArrayElement;
   }
 
@@ -6749,17 +6750,17 @@ bool FailureDiagnosis::visitDictionaryExpr(DictionaryExpr *E) {
     }
 
     contextualKeyType =
-      ProtocolConformance::getTypeWitnessByName(contextualType,
-                                                *Conformance,
-                                                CS->getASTContext().Id_Key,
-                                                &CS->TC)
+      ProtocolConformanceRef::getTypeWitnessByName(contextualType,
+                                                   *Conformance,
+                                                   CS->getASTContext().Id_Key,
+                                                   &CS->TC)
         ->getDesugaredType();
 
     contextualValueType =
-      ProtocolConformance::getTypeWitnessByName(contextualType,
-                                                *Conformance,
-                                                CS->getASTContext().Id_Value,
-                                                &CS->TC)
+      ProtocolConformanceRef::getTypeWitnessByName(contextualType,
+                                                   *Conformance,
+                                                   CS->getASTContext().Id_Value,
+                                                   &CS->TC)
         ->getDesugaredType();
 
     assert(contextualKeyType && contextualValueType &&
diff --git a/lib/Sema/TypeCheckGeneric.cpp b/lib/Sema/TypeCheckGeneric.cpp
@@ -980,8 +980,8 @@ Type TypeChecker::getWitnessType(Type type, ProtocolDecl *protocol,
                                  ProtocolConformanceRef conformance,
                                  Identifier name,
                                  Diag<> brokenProtocolDiag) {
-  Type ty = ProtocolConformance::getTypeWitnessByName(type, conformance,
-                                                      name, this);
+  Type ty = ProtocolConformanceRef::getTypeWitnessByName(type, conformance,
+                                                         name, this);
   if (!ty &&
       !(conformance.isConcrete() && conformance.getConcrete()->isInvalid()))
     diagnose(protocol->getLoc(), brokenProtocolDiag);
diff --git a/lib/Sema/TypeCheckProtocol.cpp b/lib/Sema/TypeCheckProtocol.cpp
@@ -5095,7 +5095,7 @@ void TypeChecker::useBridgedNSErrorConformances(DeclContext *dc, Type type) {
     // Hack: If we've used a conformance to the _BridgedStoredNSError
     // protocol, also use the RawRepresentable and _ErrorCodeProtocol
     // conformances on the Code associated type witness.
-    if (auto codeType = ProtocolConformance::getTypeWitnessByName(
+    if (auto codeType = ProtocolConformanceRef::getTypeWitnessByName(
                           type, *conformance, Context.Id_Code, this)) {
       (void)conformsToProtocol(codeType, errorCodeProto, dc,
                                ConformanceCheckFlags::Used);
@@ -5110,7 +5110,7 @@ void TypeChecker::useBridgedNSErrorConformances(DeclContext *dc, Type type) {
                      (ConformanceCheckFlags::SuppressDependencyTracking|
                       ConformanceCheckFlags::Used));
   if (conformance && conformance->isConcrete()) {
-    if (Type errorType = ProtocolConformance::getTypeWitnessByName(
+    if (Type errorType = ProtocolConformanceRef::getTypeWitnessByName(
           type, *conformance, Context.Id_ErrorType, this)) {
       (void)conformsToProtocol(errorType, bridgedStoredNSError, dc,
                                ConformanceCheckFlags::Used);
diff --git a/validation-test/compiler_crashers_2_fixed/0069-sr3657.swift b/validation-test/compiler_crashers_2_fixed/0069-sr3657.swift
diff --git a/validation-test/compiler_crashers_2_fixed/0070-sr3515.swift b/validation-test/compiler_crashers_2_fixed/0070-sr3515.swift
diff --git a/validation-test/compiler_crashers_2_fixed/0071-sr3714.swift b/validation-test/compiler_crashers_2_fixed/0071-sr3714.swift
diff --git a/validation-test/compiler_crashers_2_fixed/0072-sr3895-2.swift b/validation-test/compiler_crashers_2_fixed/0072-sr3895-2.swift
@@ -0,0 +1,72 @@
+// RUN: %target-swift-frontend %s -emit-ir
+
+public class TiPresenter<V> {
+    
+    private var view: V? = nil
+    
+    public func create() {
+        
+    }
+    
+    public func attchView(view: V) {
+        self.view = view
+    }
+    
+    public func detachView() {
+        self.view = nil
+    }
+    
+    public func destroy() {
+        
+    }
+}
+
+
+public class TiViewController<P: TiPresenter<V>, V>
+    /*: UiViewController*/ // should extend UiViewController but this is not problem here
+{
+    
+    lazy var presenter: P = {
+        return self.providePresenter()
+    }()
+    
+    public init() {
+        presenter.create()
+    }
+    
+    func providePresenter() -> P {
+        fatalError("must override")
+    }
+    
+    func provideView() -> V {
+        if (self is V) {
+            return self as! V
+        } else {
+            fatalError("UIViewController doesn't implement TiView interface")
+        }
+    }
+}
+
+
+protocol MyView {
+    func setDataItems(_: [String])
+}
+
+class MyPresenter: TiPresenter<MyView> {
+}
+
+
+class MyController: TiViewController<MyPresenter, MyView>, MyView {
+
+    
+    override func providePresenter() -> MyPresenter {
+        return MyPresenter()
+    }
+    
+    internal func setDataItems(_: [String]) {
+        //TODO
+    }
+}
+
+let vc = MyController()
+let p = vc.presenter
diff --git a/validation-test/compiler_crashers_2_fixed/0072-sr3895.swift b/validation-test/compiler_crashers_2_fixed/0072-sr3895.swift
