From f7b1007345831e20e6b89bbc1dfcac6dbcaf9a99 Mon Sep 17 00:00:00 2001 From: Justin Bogner Date: Mon, 6 Nov 2017 21:06:09 +0000 Subject: [PATCH] update_mir_test_checks: Be careful about replacing entire vregs Previously, this could end up replacing a vreg like %14 with [[VREG1]]4, where VREG1 was the match for %1. That's obviously not correct, though it hasn't actually come up in any tests I've converted so far. llvm-svn: 317509 --- llvm/utils/update_mir_test_checks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/llvm/utils/update_mir_test_checks.py b/llvm/utils/update_mir_test_checks.py index 015c4279bad7..2934f09f6b37 100755 --- a/llvm/utils/update_mir_test_checks.py +++ b/llvm/utils/update_mir_test_checks.py @@ -254,7 +254,8 @@ def add_check_lines(test, output_lines, prefix, func_name, single_bb, func_line = func_line.replace( vreg.group(1), '[[{}:%[0-9]+]]'.format(name), 1) for number, name in vreg_map.items(): - func_line = func_line.replace(number, '[[{}]]'.format(name)) + func_line = re.sub(r'{}\b'.format(number), '[[{}]]'.format(name), + func_line) check_line = '{}: {}'.format(check, func_line[indent:]).rstrip() output_lines.append(check_line)