---

yaml
---
r: 348845
b: refs/heads/master
c: 7063ecd
h: refs/heads/master
i:
  348843: 394cdcd

Author: slavapestov

[refs]

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

trunk/include/swift/Sema/IDETypeChecking.h

@@ -36,9 +36,6 @@ namespace swift {
   class ValueDecl;
   class DeclName;
 
-  /// Typecheck a declaration parsed during code completion.
-  void typeCheckCompletionDecl(Decl *D);
-
   /// Typecheck binding initializer at \p bindingIndex.
   void typeCheckPatternBinding(PatternBindingDecl *PBD, unsigned bindingIndex);
 

trunk/lib/IDE/ExprContextAnalysis.cpp

@@ -52,6 +52,8 @@ void typeCheckContextImpl(DeclContext *DC, SourceLoc Loc) {
   case DeclContextKind::SerializedLocal:
   case DeclContextKind::TopLevelCodeDecl:
   case DeclContextKind::EnumElementDecl:
+  case DeclContextKind::GenericTypeDecl:
+  case DeclContextKind::SubscriptDecl:
     // Nothing to do for these.
     break;
 
@@ -61,7 +63,7 @@ void typeCheckContextImpl(DeclContext *DC, SourceLoc Loc) {
         auto i = patternInit->getBindingIndex();
         if (PBD->getInit(i)) {
           PBD->getPattern(i)->forEachVariable([](VarDecl *VD) {
-            typeCheckCompletionDecl(VD);
+            (void) VD->getInterfaceType();
           });
           if (!PBD->isInitializerChecked(i))
             typeCheckPatternBinding(PBD, i);
@@ -72,29 +74,18 @@ void typeCheckContextImpl(DeclContext *DC, SourceLoc Loc) {
 
   case DeclContextKind::AbstractFunctionDecl: {
     auto *AFD = cast<AbstractFunctionDecl>(DC);
-
-    // FIXME: This shouldn't be necessary, but we crash otherwise.
-    if (auto *AD = dyn_cast<AccessorDecl>(AFD))
-      typeCheckCompletionDecl(AD->getStorage());
-
     typeCheckAbstractFunctionBodyUntil(AFD, Loc);
     break;
   }
 
   case DeclContextKind::ExtensionDecl:
-    typeCheckCompletionDecl(cast<ExtensionDecl>(DC));
-    break;
-
-  case DeclContextKind::GenericTypeDecl:
-    typeCheckCompletionDecl(cast<GenericTypeDecl>(DC));
+    // Make sure the extension has been bound, in case it is in an
+    // inactive #if or something weird like that.
+    cast<ExtensionDecl>(DC)->computeExtendedNominal();
     break;
 
   case DeclContextKind::FileUnit:
     llvm_unreachable("module scope context handled above");
-
-  case DeclContextKind::SubscriptDecl:
-    typeCheckCompletionDecl(cast<SubscriptDecl>(DC));
-    break;
   }
 }
 } // anonymous namespace

trunk/lib/Sema/TypeChecker.cpp

@@ -618,22 +618,6 @@ swift::handleSILGenericParams(ASTContext &Ctx, GenericParamList *genericParams,
   return createTypeChecker(Ctx).handleSILGenericParams(genericParams, DC);
 }
 
-void swift::typeCheckCompletionDecl(Decl *D) {
-  auto &Ctx = D->getASTContext();
-
-  DiagnosticSuppression suppression(Ctx.Diags);
-  (void)createTypeChecker(Ctx);
-  if (auto ext = dyn_cast<ExtensionDecl>(D)) {
-    if (auto *nominal = ext->computeExtendedNominal()) {
-      // FIXME(InterfaceTypeRequest): Remove this.
-      (void)nominal->getInterfaceType();
-    }
-  } else {
-    // FIXME(InterfaceTypeRequest): Remove this.
-    (void)cast<ValueDecl>(D)->getInterfaceType();
-  }
-}
-
 void swift::typeCheckPatternBinding(PatternBindingDecl *PBD,
                                     unsigned bindingIndex) {
   assert(!PBD->isInitializerChecked(bindingIndex) &&