languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-14 17:18:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[vm] Exclude enum constructor from coverage

Browse source 
It's not possible for the user to invoke these constructors.

Fixes: https://github.com/dart-lang/coverage/issues/377
TEST=Updated existing enhanced enum coverage test
Change-Id: I8b1fea269b278fcb92f38ba09f039dd8bccbfd31
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/245201
Reviewed-by: Alexander Markov <alexmarkov@google.com>
Commit-Queue: Liam Appelbe <liama@google.com>
This commit is contained in:
Liam Appelbe 2022-05-18 21:39:40 +00:00 committed by Commit Bot
parent 58c84272bc
commit 3fd1e1ed7f
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
runtime/vm/source_report.cc
View file

@ -161,6 +161,14 @@ bool SourceReport::ShouldSkipFunction(const Function& func) {
}
}
// Enum constuctors cannot be invoked by the user, so ignore them.
if (func.IsGenerativeConstructor()) {
Class& cls = Class::Handle(func.Owner());
if (cls.is_enum_class()) {
return true;
}
}
return false;
}

19
runtime/vm/source_report_test.cc
View file

@ -1075,6 +1075,7 @@ ISOLATE_UNIT_TEST_CASE(SourceReport_Coverage_IssueCov341_LateFinalVars) {
ISOLATE_UNIT_TEST_CASE(SourceReport_Coverage_IssueCov386_EnhancedEnums) {
// https://github.com/dart-lang/coverage/issues/386
// https://github.com/dart-lang/coverage/issues/377
// WARNING: This MUST be big enough for the serialised JSON string.
const int kBufferSize = 1024;
char buffer[kBufferSize];
@ -1082,9 +1083,10 @@ ISOLATE_UNIT_TEST_CASE(SourceReport_Coverage_IssueCov386_EnhancedEnums) {
"enum FoodType {\n"
" candy();\n"
" const FoodType();\n"
" factory FoodType.candyFactory() => candy;\n"
"}\n"
"void main() {\n"
" final food = FoodType.candy;\n"
" final food = FoodType.candyFactory();\n"
"}\n";
Library& lib = Library::Handle();
@ -1103,19 +1105,14 @@ ISOLATE_UNIT_TEST_CASE(SourceReport_Coverage_IssueCov386_EnhancedEnums) {
EXPECT_STREQ(
"{\"type\":\"SourceReport\",\"ranges\":["
// There are two ranges at the FoodType constructor. This one is missed,
// but the one below is hit, so it's ok. The point is that the synthetic
// toString method doesn't appear in this hitmap.
"{\"scriptIndex\":0,\"startPos\":29,\"endPos\":45,\"compiled\":true,"
"\"coverage\":{\"hits\":[],\"misses\":[29]}},"
// Main is hit.
"{\"scriptIndex\":0,\"startPos\":49,\"endPos\":94,\"compiled\":true,"
"{\"scriptIndex\":0,\"startPos\":49,\"endPos\":89,\"compiled\":true,"
"\"coverage\":{\"hits\":[49],\"misses\":[]}},"
// FoodType constructor is hit.
"{\"scriptIndex\":0,\"compiled\":true,\"startPos\":29,\"endPos\":45,"
"\"coverage\":{\"hits\":[29],\"misses\":[]}}],"
// The enum's constructor, and toString, are not included in the hitmap,
// but the factory is included.
"{\"scriptIndex\":0,\"startPos\":93,\"endPos\":147,\"compiled\":true,"
"\"coverage\":{\"hits\":[93,131],\"misses\":[]}}],"
// Only one script in the script table.
"\"scripts\":[{\"type\":\"@Script\",\"fixedId\":true,\"id\":\"\","