Merge pull request #29793 from slavapestov/small-misc-cleanups

Small miscellaneous cleanups

Author: slavapestov

include/swift/Basic/Statistics.def

@@ -224,9 +224,6 @@ FRONTEND_STATISTIC(Sema, NumAccessorsSynthesized)
 /// Number of synthesized accessor bodies.
 FRONTEND_STATISTIC(Sema, NumAccessorBodiesSynthesized)
 
-/// Number of full function bodies typechecked.
-FRONTEND_STATISTIC(Sema, NumFunctionsTypechecked)
-
 /// Number of generic signature builders constructed. Rough proxy for
 /// amount of work the GSB does analyzing type signatures.
 FRONTEND_STATISTIC(Sema, NumGenericSignatureBuilders)

lib/SILGen/SILGenType.cpp

@@ -277,17 +277,17 @@ class SILGenVTable : public SILVTableVisitor<SILGenVTable> {
     IsSerialized_t serialized = IsNotSerialized;
     auto classIsPublic = theClass->getEffectiveAccess() >= AccessLevel::Public;
     // Only public, fixed-layout classes should have serialized vtables.
-    if (classIsPublic && !theClass->isResilient())
+    if (classIsPublic && !isResilient)
       serialized = IsSerialized;
 
     // Finally, create the vtable.
     SILVTable::create(SGM.M, theClass, serialized, vtableEntries);
   }
 
   void visitAncestor(ClassDecl *ancestor) {
-    auto superTy = ancestor->getSuperclass();
-    if (superTy)
-      visitAncestor(superTy->getClassOrBoundGenericClass());
+    auto *superDecl = ancestor->getSuperclassDecl();
+    if (superDecl)
+      visitAncestor(superDecl);
 
     addVTableEntries(ancestor);
   }

lib/Sema/TypeCheckStmt.cpp

@@ -1932,15 +1932,6 @@ TypeCheckFunctionBodyUntilRequest::evaluate(Evaluator &evaluator,
                                             SourceLoc endTypeCheckLoc) const {
   ASTContext &ctx = AFD->getASTContext();
 
-  // Accounting for type checking of function bodies.
-  // FIXME: We could probably take this away, given that the request-evaluator
-  // does much of it for us.
-  FrontendStatsTracer StatsTracer(ctx.Stats, "typecheck-fn", AFD);
-  PrettyStackTraceDecl StackEntry("type-checking", AFD);
-
-  if (ctx.Stats)
-    ctx.Stats->getFrontendCounters().NumFunctionsTypechecked++;
-
   Optional<FunctionBodyTimer> timer;
   const auto &tyOpts = ctx.TypeCheckerOpts;
   if (tyOpts.DebugTimeFunctionBodies || tyOpts.WarnLongFunctionBodies)

test/Misc/stats_dir_profiler.swift

@@ -7,7 +7,7 @@
 // RUN: %FileCheck -check-prefix=ENTITIES -input-file %t/stats-entities/*.dir/Time.User.entities %s
 
 // EVENTS: {{perform-sema;.*;typecheck-decl.* [0-9]+}}
-// ENTITIES: {{perform-sema;.*;typecheck-fn bar\(\);typecheck-stmt.* [0-9]+}}
+// ENTITIES: {{perform-sema;.*;TypeCheckFunctionBodyUntilRequest bar\(\);typecheck-stmt.* [0-9]+}}
 
 public func foo() {
     print("hello")

test/SILGen/subclass_existentials.swift

@@ -295,9 +295,9 @@ func archetypeUpcasts<T,
                       BaseTAndP : Base<T> & P,
                       BaseIntAndP : Base<Int> & P,
                       DerivedT : Derived>(
-  baseTAndP: BaseTAndP,
-  baseIntAndP : BaseIntAndP,
-  derived : DerivedT) {
+                      baseTAndP: BaseTAndP,
+                      baseIntAndP : BaseIntAndP,
+                      derived : DerivedT) {
   // CHECK: bb0([[ARG0:%.*]] : @guaranteed $BaseTAndP, [[ARG1:%.*]] : @guaranteed $BaseIntAndP, [[ARG2:%.*]] : @guaranteed $DerivedT)
   // CHECK: [[COPIED:%.*]] = copy_value [[ARG0]] : $BaseTAndP
   // CHECK-NEXT: init_existential_ref [[COPIED]] : $BaseTAndP : $BaseTAndP, $Base<T> & P

validation-test/compiler_scale/scale_neighbouring_getset.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select NumFunctionsTypechecked %s
+// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select TypeCheckFunctionBodyUntilRequest %s
 // REQUIRES: asserts
 
 struct Struct${N} {