Better stack address cleanup []

Author: DarkArc

dev_tools/bin/edg-normalize-test-output

@@ -29,6 +29,14 @@ def parse_args() -> argparse.Namespace:
     action = 'store_true',
     help = 'include rules to normalize IL'
   )
+  parser.add_argument(
+    '--stack-addr-cleanup',
+    dest = 'stack_addr_cleanup',
+    action = 'store_true',
+    help = (
+      'replace host-dependent stack / high addresses with STACK or 0xSTACK'
+    )
+  )
   return parser.parse_args()
 
 def die(signum: Any, frame: Any) -> None:
@@ -73,6 +81,7 @@ def main() -> None:
 
   normalizer = edgtest.filter.Normalizer(
     normalize_il = args.normalize_il,
+    stack_addr_cleanup = args.stack_addr_cleanup,
     env = os.environ,
     build_constants = build_constants
   )

dev_tools/pylibs/edgtest/filter/__init__.py

@@ -96,8 +96,17 @@ async def load_build_constants(compiler_bin: Path) -> BuildConstants:
   **_ESCAPED_REGEX_REPLACEMENTS
 }
 
+# Stack / high canonical user addresses that vary across hosts and ASLR.
+# Match both %p (0x-prefixed) and %x (bare) forms.  The 0x form must be listed
+# first so it wins over the bare form.
+_STACK_ADDR_REPLACEMENTS = (
+  (r'0x(?:7fffffff[0-9a-f]+|ffff[0-9a-f]+)', '0xSTACK'),
+  (r'(?<![0-9a-fx])(?:7fffffff[0-9a-f]+|ffff[0-9a-f]+)', 'STACK'),
+)
+
 class Normalizer:
-  def __init__(self, *, normalize_il: bool, env: Dict[str, str],
+  def __init__(self, *, normalize_il: bool, stack_addr_cleanup: bool = False,
+               env: Dict[str, str],
                build_constants: BuildConstants) -> None:
     self.replacements = list(GLOBAL_REGEX_REPLACEMENTS.items())
     self.replacements.extend([
@@ -119,6 +128,9 @@ def __init__(self, *, normalize_il: bool, env: Dict[str, str],
         '/edg/workspace'
       ))
 
+    if stack_addr_cleanup:
+      self.replacements.extend(_STACK_ADDR_REPLACEMENTS)
+
     if normalize_il:
       # Detect the compiler version string.
       self.replacements.append(

tests/tests/imported/gnu/cpp/cpp0x/constexpr-tuple.sft.cpp

@@ -1,6 +1,6 @@
 //type: rp
 //options: --c++11
-//filter:sed -E -e 's/0x(7fffffff[0-9a-f]+|ffff[0-9a-f]+)/0xSTACK/g'
+//filter:edg-normalize-test-output --stack-addr-cleanup
 # 0 "./cpp0x/constexpr-tuple.C"
 # 0 "<built-in>"
 # 0 "<command-line>"

tests/tests/imported/gnu/cpp/ext/stmtexpr1.sft.cpp

@@ -1,6 +1,6 @@
 //type: rp
 //options:
-//filter:sed -E -e 's/0x(7fffffff[0-9a-f]+|ffff[0-9a-f]+)/0xSTACK/g'
+//filter:edg-normalize-test-output --stack-addr-cleanup
 // Copyright (C) 2003 Free Software Foundation, Inc.
 // Contributed by Nathan Sidwell 30 Jul 2003 <nathan@codesourcery.com>
 

tests/tests/imported/gnu/cpp/init/elide3.sft.cpp

@@ -1,6 +1,6 @@
 //type: rp
 //options: 
-//filter:sed -E -e 's/0x(7fffffff[0-9a-f]+|ffff[0-9a-f]+)/0xSTACK/g'
+//filter:edg-normalize-test-output --stack-addr-cleanup
 // PR c++/67557
 // { dg-do run }
 

tests/tests/imported/gnu/cpp/opt/alias2.sft.cpp

@@ -1,6 +1,6 @@
 //type: rp
 //options:
-//filter:sed -E -e 's/ffff[c-f][0-9a-f]{3}/STACK/g'
+//filter:edg-normalize-test-output --stack-addr-cleanup
 // { dg-do run }
 // { dg-options "-O2" }
 

tests/tests/imported/gnu/cpp/opt/tmp1.sft.cpp

@@ -1,6 +1,6 @@
 //type: rp
 //options: 
-//filter:sed -E -e 's/0x(7fffffff[0-9a-f]+|ffff[0-9a-f]+)/0xSTACK/g'
+//filter:edg-normalize-test-output --stack-addr-cleanup
 // { dg-do run }
 
 

tests/tests/imported/gnu/cpp/tc1/dr20.sft.cpp

@@ -1,6 +1,6 @@
 //type: rp
 //options:
-//filter:sed -E -e 's/ffff[c-f][0-9a-f]{3}/STACK/g'
+//filter:edg-normalize-test-output --stack-addr-cleanup
 // { dg-do run }
 // Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
 // DR20: Some clarifications needed for 12.8 para 15