---

yaml
---
r: 349072
b: refs/heads/master
c: 90fa96d
h: refs/heads/master

Author: slavapestov

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 09034fdf6660b2437a419ece5da57cc8255bc375
+refs/heads/master: 90fa96d8fada549fa358d49ec0ffbd43ca3fefc8
 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/Decl.h

@@ -5484,10 +5484,6 @@ class SubscriptDecl : public GenericContext, public AbstractStorageDecl {
   TypeLoc &getElementTypeLoc() { return ElementTy; }
   const TypeLoc &getElementTypeLoc() const { return ElementTy; }
 
-  /// Compute the interface type of this subscript from the parameter and
-  /// element types.
-  void computeType();
-
   /// Determine the kind of Objective-C subscripting this declaration
   /// implies.
   ObjCSubscriptKind getObjCSubscriptKind() const;

trunk/lib/AST/Decl.cpp

@@ -6145,22 +6145,6 @@ Type SubscriptDecl::getElementInterfaceType() const {
                            ErrorType::get(ctx));
 }
 
-void SubscriptDecl::computeType() {
-  auto elementTy = getElementInterfaceType();
-
-  SmallVector<AnyFunctionType::Param, 2> argTy;
-  getIndices()->getParams(argTy);
-
-  Type funcTy;
-  if (auto sig = getGenericSignature())
-    funcTy = GenericFunctionType::get(sig, argTy, elementTy);
-  else
-    funcTy = FunctionType::get(argTy, elementTy);
-
-  // Record the interface type.
-  setInterfaceType(funcTy);
-}
-
 ObjCSubscriptKind SubscriptDecl::getObjCSubscriptKind() const {
   // If the index type is an integral type, we have an indexed
   // subscript.

trunk/lib/ClangImporter/ImportDecl.cpp

@@ -6734,7 +6734,6 @@ SwiftDeclConverter::importSubscript(Decl *decl,
 
   subscript->setIsSetterMutating(false);
   makeComputed(subscript, getterThunk, setterThunk);
-  subscript->computeType();
 
   Impl.recordImplicitUnwrapForDecl(subscript, isIUO);
 

trunk/lib/Sema/TypeCheckDecl.cpp

@@ -4285,7 +4285,20 @@ void TypeChecker::validateDecl(ValueDecl *D) {
   case DeclKind::Subscript: {
     auto *SD = cast<SubscriptDecl>(D);
     DeclValidationRAII IBV(SD);
-    SD->computeType();
+
+    auto elementTy = SD->getElementInterfaceType();
+
+    SmallVector<AnyFunctionType::Param, 2> argTy;
+    SD->getIndices()->getParams(argTy);
+
+    Type funcTy;
+    if (auto sig = SD->getGenericSignature())
+      funcTy = GenericFunctionType::get(sig, argTy, elementTy);
+    else
+      funcTy = FunctionType::get(argTy, elementTy);
+
+    // Record the interface type.
+    SD->setInterfaceType(funcTy);
     break;
   }
 

trunk/lib/Serialization/Deserialization.cpp

@@ -3691,7 +3691,6 @@ class swift::DeclDeserializer {
     auto elemInterfaceType = MF.getType(elemInterfaceTypeID);
     subscript->getElementTypeLoc().setType(elemInterfaceType);
     subscript->setImplicitlyUnwrappedOptional(isIUO);
-    subscript->computeType();
 
     if (isImplicit)
       subscript->setImplicit();