[Sema] Remove LeaveFunctionBodyUnchecked flag from DeclChecker

At least for now, ide::typeCheckContextAt() doesn't call
'typeCheckASTNodeAtLoc()' with function decl signature position.
Also, 'getIntefaceType()' on function reference doesn't call decl
checker. So we don't need to propagate it.

Author: rintaro

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -1279,7 +1279,6 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 public:
   ASTContext &Ctx;
   SourceFile *SF;
-  bool LeaveFunctionBodyUnchecked;
 
   explicit DeclChecker(ASTContext &ctx, SourceFile *SF) : Ctx(ctx), SF(SF) {}
 
@@ -2244,9 +2243,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
       }
     }
 
-    if (LeaveFunctionBodyUnchecked) {
-      // DO nothing.
-    } else if (requiresDefinition(FD) && !FD->hasBody()) {
+    if (requiresDefinition(FD) && !FD->hasBody()) {
       // Complain if we should have a body.
       FD->diagnose(diag::func_decl_without_brace);
     } else if (FD->getDeclContext()->isLocalContext()) {
@@ -2579,9 +2576,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
     checkAccessControl(CD);
 
-    if (LeaveFunctionBodyUnchecked) {
-      // Do nothing.
-    } else if (requiresDefinition(CD) && !CD->hasBody()) {
+    if (requiresDefinition(CD) && !CD->hasBody()) {
       // Complain if we should have a body.
       CD->diagnose(diag::missing_initializer_def);
     } else if (CD->getDeclContext()->isLocalContext()) {
@@ -2599,9 +2594,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
   void visitDestructorDecl(DestructorDecl *DD) {
     TypeChecker::checkDeclAttributes(DD);
 
-    if (LeaveFunctionBodyUnchecked) {
-      // Do nothing.
-    } else if (DD->getDeclContext()->isLocalContext()) {
+    if (DD->getDeclContext()->isLocalContext()) {
       // Check local function bodies right away.
       TypeChecker::typeCheckAbstractFunctionBody(DD);
     } else if (shouldSkipBodyTypechecking(DD)) {
@@ -2613,9 +2606,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 };
 } // end anonymous namespace
 
-void TypeChecker::typeCheckDecl(Decl *D, bool LeaveBodyUnchecked) {
+void TypeChecker::typeCheckDecl(Decl *D) {
   auto *SF = D->getDeclContext()->getParentSourceFile();
-  DeclChecker declChecker(D->getASTContext(), SF);
-  declChecker.LeaveFunctionBodyUnchecked = LeaveBodyUnchecked;
-  declChecker.visit(D);
+  DeclChecker(D->getASTContext(), SF).visit(D);
 }

lib/Sema/TypeCheckStmt.cpp

@@ -323,7 +323,7 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
   bool IsBraceStmtFromTopLevelDecl;
 
   /// Skip type checking any elements inside 'BraceStmt', also this is
-  /// propagated to DeclChecker and ConstraintSystem.
+  /// propagated to ConstraintSystem.
   bool LeaveBraceStmtBodyUnchecked = false;
 
   ASTContext &getASTContext() const { return Ctx; };
@@ -624,8 +624,7 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
   }
 
   Stmt *visitDeferStmt(DeferStmt *DS) {
-    TypeChecker::typeCheckDecl(
-        DS->getTempDecl(), /*LeaveBodyUnchecked=*/LeaveBraceStmtBodyUnchecked);
+    TypeChecker::typeCheckDecl(DS->getTempDecl());
 
     Expr *theCall = DS->getCallExpr();
     TypeChecker::typeCheckExpression(theCall, DC);
@@ -1594,8 +1593,7 @@ void StmtChecker::typeCheckASTNode(ASTNode &node) {
 
   // Type check the declaration.
   if (auto *D = node.dyn_cast<Decl *>()) {
-    TypeChecker::typeCheckDecl(
-        D, /*LeaveBodyUnchecked=*/LeaveBraceStmtBodyUnchecked);
+    TypeChecker::typeCheckDecl(D);
     return;
   }
 

lib/Sema/TypeChecker.h

@@ -565,7 +565,7 @@ Type typeCheckParameterDefault(Expr *&defaultValue, DeclContext *DC,
 
 void typeCheckTopLevelCodeDecl(TopLevelCodeDecl *TLCD);
 
-void typeCheckDecl(Decl *D, bool LeaveBodyUnchecked = false);
+void typeCheckDecl(Decl *D);
 
 void addImplicitDynamicAttribute(Decl *D);
 void checkDeclAttributes(Decl *D);

test/IDE/complete_skipbody.swift

@@ -1,4 +1,5 @@
 // RUN: %swift-ide-test -code-completion -source-filename %s -code-completion-token FUNCTIONBODY -debug-forbid-typecheck-prefix FORBIDDEN | %FileCheck %s
+// RUN: %swift-ide-test -code-completion -source-filename %s -code-completion-token LOCALFUNC_PARAMINIT -debug-forbid-typecheck-prefix FORBIDDEN | %FileCheck %s
 // RUN: %swift-ide-test -code-completion -source-filename %s -code-completion-token TOPLEVEL -debug-forbid-typecheck-prefix FORBIDDEN | %FileCheck %s
 
 struct FORBIDDEN_Struct {
@@ -33,6 +34,11 @@ func test(valueOptOpt: MyStruct??) {
     return
   }
 
+  func localFunc(_ x: Int) -> Int {
+    let FORBIDDEN_unrelatedLocal = FORBIDDEN_Struct()
+    return 1
+  }
+
   if (value.x == 1) {
     let unrelated2 = FORBIDDEN_Struct()
     switch value.x {
@@ -41,9 +47,15 @@ func test(valueOptOpt: MyStruct??) {
       _ = { xx in
         let unrelated4 = FORBIDDEN_Struct()
 
-        if xx == value.#^FUNCTIONBODY^# {
+        if xx == localFunc(value.#^FUNCTIONBODY^#) {
+          let unrelated5 = FORBIDDEN_Struct()
           return 1
         }
+
+        func innerFunc(x: Int = value.#^LOCALFUNC_PARAMINIT^#) {
+          let unrelated6 = FORBIDDEN_Struct()
+        }
+
         return 0;
       } (x)
     default: