Merge pull request swiftlang#12018 from slavapestov/ide-small-cleanups

Author: swift-ci

lib/IDE/CodeCompletion.cpp

@@ -1327,13 +1327,13 @@ class CodeCompletionCallbacksImpl : public CodeCompletionCallbacks {
   /// to the \c Consumer.
   bool DeliveredResults = false;
 
-  bool typecheckContextImpl(DeclContext *DC) {
+  bool typecheckContext(DeclContext *DC) {
     // Nothing to type check in module context.
     if (DC->isModuleScopeContext())
       return true;
 
     // Type check the parent context.
-    if (!typecheckContextImpl(DC->getParent()))
+    if (!typecheckContext(DC->getParent()))
       return false;
 
     // Type-check this context.
@@ -1370,17 +1370,6 @@ class CodeCompletionCallbacksImpl : public CodeCompletionCallbacks {
     llvm_unreachable("Unhandled DeclContextKind in switch.");
   }
 
-  /// \returns true on success, false on failure.
-  bool typecheckContext() {
-    return typecheckContextImpl(CurDeclContext);
-  }
-
-  /// \returns true on success, false on failure.
-  bool typecheckParsedDecl() {
-    assert(ParsedDecl && "should have a parsed decl");
-    return typeCheckCompletionDecl(ParsedDecl);
-  }
-
   Optional<std::pair<Type, ConcreteDeclRef>> typeCheckParsedExpr() {
     assert(ParsedExpr && "should have an expression");
 
@@ -5115,17 +5104,14 @@ void CodeCompletionCallbacksImpl::doneParsing() {
   // Add keywords even if type checking fails completely.
   addKeywords(CompletionContext.getResultSink(), MaybeFuncBody);
 
-  if (!typecheckContext())
-    return;
-
-  if (ParsedDecl && !typecheckParsedDecl())
-    return;
-
   if (auto *DC = dyn_cast_or_null<DeclContext>(ParsedDecl)) {
     if (DC->isChildContextOf(CurDeclContext))
       CurDeclContext = DC;
   }
 
+  if (!typecheckContext(CurDeclContext))
+    return;
+
   Optional<Type> ExprType;
   ConcreteDeclRef ReferencedDecl = nullptr;
   if (ParsedExpr) {

lib/Parse/ParseDecl.cpp

@@ -4848,11 +4848,11 @@ Parser::parseDeclFunc(SourceLoc StaticLoc, StaticSpellingKind StaticSpelling,
 
   // Create the decl for the func and add it to the parent scope.
   auto *FD = FuncDecl::create(Context, StaticLoc, StaticSpelling,
-                        FuncLoc, FullName, NameLoc,
-                        /*Throws=*/throwsLoc.isValid(), throwsLoc,
-                        /*AccessorKeywordLoc=*/SourceLoc(),
-                        nullptr, BodyParams, FuncRetTy,
-                        CurDeclContext);
+                              FuncLoc, FullName, NameLoc,
+                              /*Throws=*/throwsLoc.isValid(), throwsLoc,
+                              /*AccessorKeywordLoc=*/SourceLoc(),
+                              nullptr, BodyParams, FuncRetTy,
+                              CurDeclContext);
 
   // Parse a 'where' clause if present, adding it to our GenericParamList.
   if (Tok.is(tok::kw_where)) {

lib/SILOptimizer/Utils/OptimizerStatsUtils.cpp

@@ -716,15 +716,15 @@ void processFuncStatsChanges(SILFunction *F, FunctionStat &OldStat,
   // TODO: handle cases where a function got smaller.
   if ((SILStatsDumpAll &&
        (DeltaBlockCount != 0.0 || OldStat.BlockCount == 0)) ||
-      (abs(DeltaBlockCount) > FuncBlockCountDeltaThreshold &&
+      (std::abs(DeltaBlockCount) > FuncBlockCountDeltaThreshold &&
        OldStat.BlockCount > FuncBlockCountMinThreshold)) {
     stats_os() << nl.get();
     printCounterChange("function", "block", DeltaBlockCount, OldStat.BlockCount,
                        NewStat.BlockCount, Ctx, F->getName());
   }
 
   if ((SILStatsDumpAll && (DeltaInstCount != 0.0 || OldStat.InstCount == 0)) ||
-      (abs(DeltaInstCount) > FuncInstCountDeltaThreshold &&
+      (std::abs(DeltaInstCount) > FuncInstCountDeltaThreshold &&
        OldStat.InstCount > FuncInstCountMinThreshold)) {
     stats_os() << nl.get();
     printCounterChange("function", "inst", DeltaInstCount, OldStat.InstCount,
@@ -760,7 +760,7 @@ void processModuleStatsChanges(ModuleStat &OldStat, ModuleStat &NewStat,
   if ((SILStatsDumpAll &&
        (DeltaBlockCount != 0.0 ||
         isFirstTimeData(OldStat.BlockCount, NewStat.BlockCount))) ||
-      (abs(DeltaBlockCount) > BlockCountDeltaThreshold)) {
+      (std::abs(DeltaBlockCount) > BlockCountDeltaThreshold)) {
     stats_os() << nl.get();
     printCounterChange("module", "block", DeltaBlockCount, OldStat.BlockCount,
                        NewStat.BlockCount, Ctx);
@@ -771,7 +771,7 @@ void processModuleStatsChanges(ModuleStat &OldStat, ModuleStat &NewStat,
   if ((SILStatsDumpAll &&
        (DeltaInstCount != 0.0 ||
         isFirstTimeData(OldStat.InstCount, NewStat.InstCount))) ||
-      (abs(DeltaInstCount) > InstCountDeltaThreshold)) {
+      (std::abs(DeltaInstCount) > InstCountDeltaThreshold)) {
     stats_os() << nl.get();
     printCounterChange("module", "inst", DeltaInstCount, OldStat.InstCount,
                        NewStat.InstCount, Ctx);
@@ -782,7 +782,7 @@ void processModuleStatsChanges(ModuleStat &OldStat, ModuleStat &NewStat,
   if ((SILStatsDumpAll &&
        (DeltaFunctionCount != 0.0 ||
         isFirstTimeData(OldStat.FunctionCount, NewStat.FunctionCount))) ||
-      (abs(DeltaFunctionCount) > FunctionCountDeltaThreshold)) {
+      (std::abs(DeltaFunctionCount) > FunctionCountDeltaThreshold)) {
     stats_os() << nl.get();
     printCounterChange("module", "functions", DeltaFunctionCount,
                        OldStat.FunctionCount, NewStat.FunctionCount, Ctx);
@@ -791,9 +791,9 @@ void processModuleStatsChanges(ModuleStat &OldStat, ModuleStat &NewStat,
   // Print delta for the used memory only if it is above a threshold or we are
   // asked to dump all changes.
   if ((SILStatsDumpAll &&
-       (abs(DeltaUsedMemory) > UsedMemoryMinDeltaThreshold ||
+       (std::abs(DeltaUsedMemory) > UsedMemoryMinDeltaThreshold ||
         isFirstTimeData(OldStat.UsedMemory, NewStat.UsedMemory))) ||
-      (abs(DeltaUsedMemory) > UsedMemoryDeltaThreshold)) {
+      (std::abs(DeltaUsedMemory) > UsedMemoryDeltaThreshold)) {
     stats_os() << nl.get();
     printCounterChange("module", "memory", DeltaUsedMemory, OldStat.UsedMemory,
                        NewStat.UsedMemory, Ctx);