Skip to content
Merged
Changes from all commits
Commits
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: 19 additions & 2 deletions eval/tests/memory_safety_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,12 @@ struct TestCase {
bool reference_resolver_enabled = false;
};

enum Options { kDefault, kExhaustive, kFoldConstants };
enum Options {
kDefault,
kExhaustive,
kFoldConstants,
kFoldConstantsManagedArena
};

using ParamType = std::tuple<TestCase, Options>;

Expand All @@ -68,6 +73,9 @@ std::string TestCaseName(const testing::TestParamInfo<ParamType>& param_info) {
case Options::kFoldConstants:
opt = "opt";
break;
case Options::kFoldConstantsManagedArena:
opt = "opt_managed_arena";
break;
}

return absl::StrCat(std::get<0>(param).name, "_", opt);
Expand Down Expand Up @@ -110,6 +118,14 @@ class EvaluatorMemorySafetyTest : public testing::TestWithParam<ParamType> {
options.enable_comprehension_vulnerability_check = false;
options.short_circuiting = true;
break;
case Options::kFoldConstantsManagedArena:
options.enable_regex_precompilation = true;
options.constant_folding = true;
options.enable_comprehension_list_append = true;
options.enable_comprehension_vulnerability_check = false;
options.short_circuiting = true;
options.constant_arena = nullptr;
break;
}

options.enable_qualified_identifier_rewrites =
Expand Down Expand Up @@ -295,7 +311,8 @@ INSTANTIATE_TEST_SUITE_P(
test::IsCelBool(true),
}}),
testing::Values(Options::kDefault, Options::kExhaustive,
Options::kFoldConstants)),
Options::kFoldConstants,
Options::kFoldConstantsManagedArena)),
&TestCaseName);

} // namespace
Expand Down
Loading