Revert "Replace func name with regex for update test scripts"

This reverts commit 5eaf70a.

Author: ggeorgakoudis

clang/test/utils/update_cc_test_checks/Inputs/generated-funcs-regex.c

@@ -30,8 +30,6 @@ def parse_commandline_args(parser):
                        help='Activate CHECK line generation from this point forward')
   parser.add_argument('--disable', action='store_false', dest='enabled',
                       help='Deactivate CHECK line generation from this point forward')
-  parser.add_argument('--replace-function-regex', nargs='+', default=[],
-                      help='List of regular expressions to replace matching function names')
   args = parser.parse_args()
   global _verbose
   _verbose = args.verbose
@@ -277,8 +275,6 @@ def __init__(self, run_list, flags, scrubber_args):
     self._record_args = flags.function_signature
     self._check_attributes = flags.check_attributes
     self._scrubber_args = scrubber_args
-    # Strip double-quotes if input was read by UTC_ARGS
-    self._replace_function_regex = list(map(lambda x: x.strip('"'), flags.replace_function_regex))
     self._func_dict = {}
     self._func_order = {}
     self._global_var_dict = {}
@@ -352,30 +348,6 @@ def process_run_line(self, function_re, scrubber, raw_tool_output, prefixes):
               self._func_dict[prefix][func] = None
               continue
 
-        # Replace function names matching the regex.
-        for regex in self._replace_function_regex:
-          # Pattern that matches capture groups in the regex in leftmost order.
-          group_regex = re.compile('\(.*?\)')
-          # Replace function name with regex.
-          match = re.match(regex, func)
-          if match:
-            func_repl = regex
-            # Replace any capture groups with their matched strings.
-            for g in match.groups():
-              func_repl = group_regex.sub(g, func_repl, count=1)
-            func = '{{' + func_repl + '}}'
-
-          # Replace all calls to regex matching functions.
-          matches = re.finditer(regex, scrubbed_body)
-          for match in matches:
-            func_repl = regex
-            # Replace any capture groups with their matched strings.
-            for g in match.groups():
-                func_repl = group_regex.sub(g, func_repl, count=1)
-            # Substitute function call names that match the regex with the same
-            # capture groups set.
-            scrubbed_body = re.sub(func_repl, '{{' + func_repl + '}}', scrubbed_body)
-
         self._func_dict[prefix][func] = function_body(
             scrubbed_body, scrubbed_extra, args_and_sig, attrs)
         self._func_order[prefix].append(func)
@@ -822,8 +794,6 @@ def get_autogennote_suffix(parser, args):
       continue  # Don't add default values
     autogenerated_note_args += action.option_strings[0] + ' '
     if action.const is None:  # action takes a parameter
-      if action.nargs == '+':
-        value = ' '.join(map(lambda v: '"' + v.strip('"') + '"', value))
       autogenerated_note_args += '%s ' % value
   if autogenerated_note_args:
     autogenerated_note_args = ' %s %s' % (UTC_ARGS_KEY, autogenerated_note_args[:-1])

clang/test/utils/update_cc_test_checks/Inputs/generated-funcs-regex.c.expected

@@ -109,8 +109,7 @@ def main():
         flags=type('', (object,), {
             'verbose': ti.args.verbose,
             'function_signature': False,
-            'check_attributes': False,
-            'replace_function_regex': []}),
+            'check_attributes': False}),
         scrubber_args=[ti.args])
 
     for prefixes, llc_args, triple_in_cmd, march_in_cmd in run_list: