================ @@ -33,6 +37,11 @@ class QuerySession { llvm::StringMap<matcher::VariantValue> namedValues; bool terminate = false; +public: + bool omitBlockArguments = false; ---------------- jpienaar wrote: So these are set per query session? https://github.com/llvm/llvm-project/pull/115670