Sema: Assert if attempting to assign discriminator too early

Author: slavapestov

lib/Sema/TypeCheckStmt.cpp

@@ -356,7 +356,8 @@ namespace {
           // Assign the next discriminator.
           Identifier name = valueDecl->getBaseIdentifier();
           auto &discriminator = DeclDiscriminators[name];
-          discriminator = std::max(discriminator, std::max(InitialDiscriminator, valueDecl->getLocalDiscriminator() + 1));
+          discriminator = std::max(discriminator,
+              std::max(InitialDiscriminator, valueDecl->getLocalDiscriminator() + 1));
         }
       }
 
@@ -411,7 +412,13 @@ unsigned LocalDiscriminatorsRequest::evaluate(
   ParameterList *params = nullptr;
   ParamDecl *selfParam = nullptr;
   if (auto func = dyn_cast<AbstractFunctionDecl>(dc)) {
-    node = func->getBody();
+    if (!func->isBodySkipped()) {
+      assert(func->getBodyKind() != AbstractFunctionDecl::BodyKind::Unparsed &&
+             func->getBodyKind() != AbstractFunctionDecl::BodyKind::Parsed &&
+             "Computing local discriminators too early");
+      node = func->getBody();
+    }
+
     selfParam = func->getImplicitSelfDecl();
     params = func->getParameters();
 
@@ -428,6 +435,7 @@ unsigned LocalDiscriminatorsRequest::evaluate(
       }
     }
   } else if (auto closure = dyn_cast<ClosureExpr>(dc)) {
+    assert(closure->getType());
     node = closure->getBody();
     params = closure->getParameters();
   } else if (auto topLevel = dyn_cast<TopLevelCodeDecl>(dc)) {