Skip to content

Commit 28b66f6

Browse files
committed
Switch DeclValidation Counter to Request Counter
Now that validateDecl is gone, stop duplicating work here and use the request counter instead.
1 parent b92beb4 commit 28b66f6

12 files changed

+10
-16
lines changed

docs/CompilerPerformance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ Time,Live,IsEntry,EventName,CounterName,CounterDelta,CounterValue,EntityName,Ent
753753
40032,0,"entry","typecheck-decl","Sema.NumLazyIterableDeclContexts",40,40,"foo","[test.swift:1:1 - line:1:32]"
754754
40032,0,"entry","typecheck-decl","Sema.NumTypesDeserialized",106,106,"foo","[test.swift:1:1 - line:1:32]"
755755
40032,0,"entry","typecheck-decl","Sema.NumUnloadedLazyIterableDeclContexts",40,40,"foo","[test.swift:1:1 - line:1:32]"
756-
40135,0,"entry","typecheck-decl","Sema.NumDeclsValidated",1,1,"","[test.swift:1:13 - line:1:29]"
756+
40135,0,"entry","typecheck-decl","Sema.InterfaceTypeRequest",1,1,"","[test.swift:1:13 - line:1:29]"
757757
...
758758
```
759759

include/swift/Basic/Statistics.def

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,6 @@ FRONTEND_STATISTIC(Sema, NumCyclicOneWayComponentsCollapsed)
230230
/// of material loaded from other modules.
231231
FRONTEND_STATISTIC(Sema, NumDeclsDeserialized)
232232

233-
/// Number of declarations validated.
234-
FRONTEND_STATISTIC(Sema, NumDeclsValidated)
235-
236233
/// Number of declarations type checked.
237234
FRONTEND_STATISTIC(Sema, NumDeclsTypechecked)
238235

lib/Sema/TypeCheckDecl.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4134,9 +4134,6 @@ InterfaceTypeRequest::evaluate(Evaluator &eval, ValueDecl *D) const {
41344134

41354135
TypeChecker::checkForForbiddenPrefix(Context, D->getBaseName());
41364136

4137-
if (Context.Stats)
4138-
Context.Stats->getFrontendCounters().NumDeclsValidated++;
4139-
41404137
switch (D->getKind()) {
41414138
case DeclKind::Import:
41424139
case DeclKind::Extension:

validation-test/compiler_scale/bind_extension_decl.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select NumDeclsValidated %s
1+
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select InterfaceTypeRequest %s
22
// REQUIRES: asserts
33

44
struct Struct${N} {}

validation-test/compiler_scale/bind_nested_extension_decl.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select NumDeclsValidated %s
1+
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select InterfaceTypeRequest %s
22
// REQUIRES: asserts
33

44
struct Outer${N} {

validation-test/compiler_scale/class_members.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select NumDeclsValidated %s
1+
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select InterfaceTypeRequest %s
22
// REQUIRES: asserts
33

44
class Class${N} {

validation-test/compiler_scale/enum_indirect.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select NumDeclsValidated %s
1+
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select InterfaceTypeRequest %s
22
// REQUIRES: asserts
33

44
indirect enum Enum${N} {

validation-test/compiler_scale/enum_members.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select NumDeclsValidated %s
1+
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select InterfaceTypeRequest %s
22
// REQUIRES: asserts
33

44
enum Enum${N} {

validation-test/compiler_scale/protocol_members.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select NumDeclsValidated %s
1+
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select InterfaceTypeRequest %s
22
// REQUIRES: asserts
33

44
protocol Protocol${N} {

validation-test/compiler_scale/struct_members.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select NumDeclsValidated %s
1+
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select InterfaceTypeRequest %s
22
// REQUIRES: asserts
33

44
struct Struct${N} {

validation-test/compiler_scale/struct_nested.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select NumDeclsValidated %s
1+
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select InterfaceTypeRequest %s
22
// REQUIRES: asserts
33

44
struct Struct${N} {

validation-test/compiler_scale/used_conformances.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select NumDeclsValidated %s
1+
// RUN: %scale-test --sum-multi --begin 5 --end 16 --step 5 --select InterfaceTypeRequest %s
22
// REQUIRES: asserts
33

44
struct Generic${N}<T : Protocol${N}> {}

0 commit comments

Comments
 (0)