Skip to content

Refactor FlatbuffersTableUntypedDomainImpl::MutateSelectedField to use a visitor. #2072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −25
Open

Refactor FlatbuffersTableUntypedDomainImpl::MutateSelectedField to use a visitor. #2072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions fuzztest/internal/domains/flatbuffers_domain_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,23 +136,10 @@ uint64_t FlatbuffersTableUntypedDomainImpl::MutateSelectedField(
}

++field_counter;
if (field_counter == selected_field_index) {
VisitFlatbufferField(
schema_, field,
MutateVisitor{*this, prng, metadata, only_shrink, val});
return field_counter;
}

if (field->type()->base_type() == reflection::BaseType::Obj) {
auto sub_object = schema_->objects()->Get(field->type()->index());
if (!sub_object->is_struct()) {
field_counter +=
GetCachedDomain<FlatbuffersTableTag>(field).MutateSelectedField(
val[field->id()], prng, metadata, only_shrink,
selected_field_index - field_counter);
}
// TODO: Add support for structs.
}
VisitFlatbufferField(
schema_, field,
MutateSelectedFieldVisitor{*this, field_counter, val, prng, metadata,
only_shrink, selected_field_index});

if (field_counter >= selected_field_index) {
return field_counter;
Expand Down
38 changes: 30 additions & 8 deletions fuzztest/internal/domains/flatbuffers_domain_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,22 +618,36 @@ class FlatbuffersTableUntypedDomainImpl
}
};

struct MutateVisitor {
struct MutateSelectedFieldVisitor {
FlatbuffersTableUntypedDomainImpl& self;
uint64_t& field_counter;
corpus_type& val;
absl::BitGenRef prng;
const domain_implementor::MutationMetadata& metadata;
bool only_shrink;
corpus_type& corpus_value;
uint64_t selected_field_index;

template <typename T>
void Visit(const reflection::Field* absl_nonnull field) {
auto& domain = self.GetCachedDomain<T>(field);
auto it = corpus_value.find(field->id());
if (it == corpus_value.end()) {
if (only_shrink) return;
it = corpus_value.try_emplace(field->id(), domain.Init(prng)).first;
if (!self.IsSupportedField(field)) return;
if (only_shrink && !val.contains(field->id())) return;

if (field_counter == selected_field_index) {
auto& domain = self.GetCachedDomain<T>(field);
auto it = val.find(field->id());
if (it == val.end()) {
if (only_shrink) return;
it = val.try_emplace(field->id(), domain.Init(prng)).first;
}
domain.Mutate(it->second, prng, metadata, only_shrink);
} else {
auto& domain = self.GetCachedDomain<T>(field);
if (auto it = val.find(field->id()); it != val.end()) {
field_counter += domain.MutateSelectedField(
it->second, prng, metadata, only_shrink,
selected_field_index - field_counter);
}
}
domain.Mutate(it->second, prng, metadata, only_shrink);
}
};

Expand Down Expand Up @@ -764,6 +778,14 @@ class FlatbuffersTableDomainImpl
return inner_->CountNumberOfFields(val.untyped_corpus);
}

uint64_t MutateSelectedField(
corpus_type& val, absl::BitGenRef prng,
const domain_implementor::MutationMetadata& metadata, bool only_shrink,
uint64_t selected_field_index) {
return inner_->MutateSelectedField(val.untyped_corpus, prng, metadata,
only_shrink, selected_field_index);
}

// Mutates the given corpus value.
void Mutate(corpus_type& val, absl::BitGenRef prng,
const domain_implementor::MutationMetadata& metadata,
Expand Down
Loading