commit de220633568a29ad0386cea07e3e03503f307541
author modiking <modiking213@gmail.com> Wed Jan 17 14:31:12 2024 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Jan 17 14:36:23 2024 -0800
tree 8c5928a412833b054811591b150472ee95ddf17a
parent 167ca41dd428d0c894a528bbeffa77a2f1d63a33

[WPD][LLD] Allow glob matching of --lto-known-safe-vtables (#78505)

Makes it easier to exclude a pattern of safe vtable symbols

Testing:
ninja check-all
GitOrigin-RevId: 17c390fc789e0f0b33577add7364e89d15a44efa

ELF/Driver.cpp

diff --git a/ELF/Driver.cpp b/ELF/Driver.cpp
index 6bef09e..5ccc656 100644
--- a/ELF/Driver.cpp
+++ b/ELF/Driver.cpp
@@ -1081,7 +1081,11 @@
       error("--lto-known-safe-vtables=: expected symbol to start with _ZTV, "
             "but got " +
             knownSafeName);
-    vtableSymbolsWithNoRTTI.remove(knownSafeName);
+    Expected<GlobPattern> pat = GlobPattern::create(knownSafeName);
+    if (!pat)
+      error("--lto-known-safe-vtables=: " + toString(pat.takeError()));
+    vtableSymbolsWithNoRTTI.remove_if(
+        [&](StringRef s) { return pat->match(s); });
   }
 
   ctx.ltoAllVtablesHaveTypeInfos = vtableSymbolsWithNoRTTI.empty();

test/ELF/lto/devirt_validate_vtable_typeinfos.ll

diff --git a/test/ELF/lto/devirt_validate_vtable_typeinfos.ll b/test/ELF/lto/devirt_validate_vtable_typeinfos.ll
index eb2e997..ca7df3e 100644
--- a/test/ELF/lto/devirt_validate_vtable_typeinfos.ll
+++ b/test/ELF/lto/devirt_validate_vtable_typeinfos.ll
@@ -125,17 +125,17 @@
 
 ;; Index based WPD
 ; RUN: ld.lld %t1.o %t2_nortti.o -o %t8_index -save-temps --lto-whole-program-visibility --lto-validate-all-vtables-have-type-infos \
-; RUN:   --lto-known-safe-vtables=_ZTV6Native -mllvm -pass-remarks=. 2>&1 | FileCheck %s --check-prefix=REMARK
+; RUN:   --lto-known-safe-vtables='_ZTV6N*' -mllvm -pass-remarks=. 2>&1 | FileCheck %s --check-prefix=REMARK
 ; RUN: llvm-dis %t1.o.4.opt.bc -o - | FileCheck %s --check-prefixes=CHECK-COMMON-IR-LABEL,CHECK-IR
 
 ;; Hybrid WPD
 ; RUN: ld.lld %t1_hybrid.o %t2_nortti.o -o %t8_hybrid -save-temps --lto-whole-program-visibility --lto-validate-all-vtables-have-type-infos \
-; RUN:   --lto-known-safe-vtables=_ZTV6Native -mllvm -pass-remarks=. 2>&1 | FileCheck %s --check-prefix=REMARK
+; RUN:   --lto-known-safe-vtables='_ZTV6N*' -mllvm -pass-remarks=. 2>&1 | FileCheck %s --check-prefix=REMARK
 ; RUN: llvm-dis %t1_hybrid.o.4.opt.bc -o - | FileCheck %s --check-prefixes=CHECK-COMMON-IR-LABEL,CHECK-IR
 
 ;; Regular LTO WPD
 ; RUN: ld.lld %t1_regular.o %t2_nortti.o -o %t8_regular -save-temps --lto-whole-program-visibility --lto-validate-all-vtables-have-type-infos \
-; RUN:   --lto-known-safe-vtables=_ZTV6Native -mllvm -pass-remarks=. 2>&1 | FileCheck %s --check-prefix=REMARK
+; RUN:   --lto-known-safe-vtables='_ZTV6N*' -mllvm -pass-remarks=. 2>&1 | FileCheck %s --check-prefix=REMARK
 ; RUN: llvm-dis %t8_regular.0.4.opt.bc -o - | FileCheck %s --check-prefixes=CHECK-COMMON-IR-LABEL,CHECK-IR
 
 ;; Only check for definitions of vtables symbols, just having a reference does not allow a type to