[llvm] 4de09e0 - [Utils][FIX] Unbreak update_XXX_test_checks after 3598b810029d

[Johannes Doerfert via llvm-commits]

Author: Johannes Doerfert
Date: 2019-10-31T13:43:27-05:00
New Revision: 4de09e0f44605aa98ff1a9c103fc95c34d222bf8

URL: https://github.com/llvm/llvm-project/commit/4de09e0f44605aa98ff1a9c103fc95c34d222bf8
DIFF: https://github.com/llvm/llvm-project/commit/4de09e0f44605aa98ff1a9c103fc95c34d222bf8.diff

LOG: [Utils][FIX] Unbreak update_XXX_test_checks after 3598b810029d

The users of build_function_body_dictionary and add_checks need to be
adjusted after the changes in UpdateTestChecks/common.py.

Added: 
    

Modified: 
    llvm/utils/UpdateTestChecks/asm.py
    llvm/utils/update_cc_test_checks.py

Removed: 
    


################################################################################
diff  --git a/llvm/utils/UpdateTestChecks/asm.py b/llvm/utils/UpdateTestChecks/asm.py
index 81556d65802c..2c9f4d9c5060 100644
--- a/llvm/utils/UpdateTestChecks/asm.py
+++ b/llvm/utils/UpdateTestChecks/asm.py
@@ -354,11 +354,11 @@ def build_function_body_dictionary_for_triple(args, raw_tool_output, triple, pre
   scrubber, function_re = handler
   common.build_function_body_dictionary(
           function_re, scrubber, [args], raw_tool_output, prefixes,
-          func_dict, args.verbose)
+          func_dict, args.verbose, False)
 
 ##### Generator of assembly CHECK lines
 
 def add_asm_checks(output_lines, comment_marker, prefix_list, func_dict, func_name):
   # Label format is based on ASM string.
-  check_label_format = '{} %s-LABEL: %s:'.format(comment_marker)
+  check_label_format = '{} %s-LABEL: %s%s:'.format(comment_marker)
   common.add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, True, False)

diff  --git a/llvm/utils/update_cc_test_checks.py b/llvm/utils/update_cc_test_checks.py
index 82959e53b36c..14d5cc36359c 100755
--- a/llvm/utils/update_cc_test_checks.py
+++ b/llvm/utils/update_cc_test_checks.py
@@ -160,7 +160,7 @@ def get_function_body(args, filename, clang_args, extra_commands, prefixes, trip
   if '-emit-llvm' in clang_args:
     common.build_function_body_dictionary(
             common.OPT_FUNCTION_RE, common.scrub_body, [],
-            raw_tool_output, prefixes, func_dict, args.verbose)
+            raw_tool_output, prefixes, func_dict, args.verbose, False)
   else:
     print('The clang command line should include -emit-llvm as asm tests '
           'are discouraged in Clang testsuite.', file=sys.stderr)