From 817620fd70e95bca1349bad655d43cee131fa338 Mon Sep 17 00:00:00 2001
From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>
Date: Fri, 8 Jul 2022 08:31:34 +0200
Subject: [PATCH] Remove dataflow support from helper.py (#7970)

* Remove dataflow support from helper.py
Related: #7964

* fix

* fmt
---
 infra/constants.py |  4 ++--
 infra/helper.py    | 14 +++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/infra/constants.py b/infra/constants.py
index 81e100b37..ac26308aa 100644
--- a/infra/constants.py
+++ b/infra/constants.py
@@ -34,8 +34,8 @@ LANGUAGES_WITH_COVERAGE_SUPPORT = [
     'c', 'c++', 'go', 'jvm', 'python', 'rust', 'swift'
 ]
 SANITIZERS = [
-    'address', 'none', 'memory', 'undefined', 'dataflow', 'thread', 'coverage',
+    'address', 'none', 'memory', 'undefined', 'thread', 'coverage',
     'introspector'
 ]
 ARCHITECTURES = ['i386', 'x86_64']
-ENGINES = ['libfuzzer', 'afl', 'honggfuzz', 'dataflow', 'none']
+ENGINES = ['libfuzzer', 'afl', 'honggfuzz', 'none']
diff --git a/infra/helper.py b/infra/helper.py
index 4c75ece9c..8c5befc90 100755
--- a/infra/helper.py
+++ b/infra/helper.py
@@ -156,10 +156,7 @@ def main():  # pylint: disable=too-many-branches,too-many-return-statements
   # We have different default values for `sanitizer` depending on the `engine`.
   # Some commands do not have `sanitizer` argument, so `hasattr` is necessary.
   if hasattr(args, 'sanitizer') and not args.sanitizer:
-    if args.engine == 'dataflow':
-      args.sanitizer = 'dataflow'
-    else:
-      args.sanitizer = constants.DEFAULT_SANITIZER
+    args.sanitizer = constants.DEFAULT_SANITIZER
 
   if args.command == 'generate':
     result = generate(args)
@@ -455,11 +452,10 @@ def _add_sanitizer_args(parser, choices=None):
   """Adds common sanitizer args."""
   if choices is None:
     choices = constants.SANITIZERS
-  parser.add_argument(
-      '--sanitizer',
-      default=None,
-      choices=choices,
-      help='the default is "address"; "dataflow" for "dataflow" engine')
+  parser.add_argument('--sanitizer',
+                      default=None,
+                      choices=choices,
+                      help='the default is "address"')
 
 
 def _add_environment_args(parser):