Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package clang-extract for openSUSE:Factory checked in at 2024-12-22 18:03:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clang-extract (Old) and /work/SRC/openSUSE:Factory/.clang-extract.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clang-extract" Sun Dec 22 18:03:22 2024 rev:15 rq:1232892 version:0~20241220.8344124 Changes: -------- --- /work/SRC/openSUSE:Factory/clang-extract/clang-extract.changes 2024-10-07 21:53:24.273183574 +0200 +++ /work/SRC/openSUSE:Factory/.clang-extract.new.1881/clang-extract.changes 2024-12-22 18:03:28.745980669 +0100 @@ -1,0 +2,20 @@ +Fri Dec 20 20:42:18 UTC 2024 - [email protected] + +- Update to version 0~20241220.8344124: + * Add support to llvm-19 + +------------------------------------------------------------------- +Fri Dec 20 20:41:01 UTC 2024 - [email protected] + +- Update to version 0~20241002.ec46efd: + * Allow clang-extract to ignore errors pointed by clang + * SymbolExternalizer: Make sure we pass a valid location when searching identifiers + * SymbolExternalizer: Add ! to TOKEN_VECTOR + * libcextract: Passes: Adjust KLP_RELOC_SYMBOL_POS format + * testsuite: inline: inlined-into-1: Fix noinline and implicit-int + * Add option to pass two debuginfos + * Fix symbol visibility + * Disable const propagation on externalized vars + * libcextract: ArgvParser: Use basename instead of std::filename + +------------------------------------------------------------------- Old: ---- clang-extract-0~20241002.ec46efd.tar.xz New: ---- clang-extract-0~20241220.8344124.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clang-extract.spec ++++++ --- /var/tmp/diff_new_pack.O5wUJh/_old 2024-12-22 18:03:29.598015661 +0100 +++ /var/tmp/diff_new_pack.O5wUJh/_new 2024-12-22 18:03:29.598015661 +0100 @@ -17,7 +17,7 @@ Name: clang-extract -Version: 0~20241002.ec46efd +Version: 0~20241220.8344124 Release: 0 Summary: A tool to extract code content from source files License: Apache-2.0 WITH LLVM-exception AND NCSA @@ -36,6 +36,9 @@ BuildRequires: meson BuildRequires: ninja +# Remove i586 support +ExcludeArch: i586 + %description A tool to extract code content from source files using the clang and LLVM infrastructure. ++++++ _service ++++++ --- /var/tmp/diff_new_pack.O5wUJh/_old 2024-12-22 18:03:29.634017140 +0100 +++ /var/tmp/diff_new_pack.O5wUJh/_new 2024-12-22 18:03:29.638017303 +0100 @@ -2,7 +2,7 @@ <service name="tar_scm" mode="manual"> <param name="scm">git</param> <param name="url">https://github.com/SUSE/clang-extract</param> - <param name="revision">ec46efd739f15ee49f99834ba56c019cbf69e4ed</param> + <param name="revision">8344124f604e2ef9202177f5b9ed61962a37c4dc</param> <param name="versionformat">0~%cd.%h</param> <param name="changesgenerate">enable</param> <param name="changesauthor">[email protected]</param> ++++++ clang-extract-0~20241002.ec46efd.tar.xz -> clang-extract-0~20241220.8344124.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/.github/workflows/testsuite.yml new/clang-extract-0~20241220.8344124/.github/workflows/testsuite.yml --- old/clang-extract-0~20241002.ec46efd/.github/workflows/testsuite.yml 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/.github/workflows/testsuite.yml 2024-12-20 21:31:15.000000000 +0100 @@ -15,7 +15,7 @@ opensuse: [tumbleweed] compiler: [clang] build-type: [debug, release] - version: [17, 18] + version: [17, 18, 19] container: image: opensuse/${{ matrix.opensuse }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/libcextract/IncludeTree.cpp new/clang-extract-0~20241220.8344124/libcextract/IncludeTree.cpp --- old/clang-extract-0~20241002.ec46efd/libcextract/IncludeTree.cpp 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/libcextract/IncludeTree.cpp 2024-12-20 21:31:15.000000000 +0100 @@ -192,7 +192,7 @@ /* For Files. */ OptionalFileEntryRef file = node->Get_FileEntry(); - const FileEntry *fentry = &file->getFileEntry(); + const FileEntryRef fentry = *file; if (Map.find(fentry) != Map.end()) { /* FIXME: Find a way to correcly map the FileEntry to the node instead of discarding future appearances. */ @@ -526,8 +526,9 @@ nullptr); if (ref.has_value()) { - const FileEntry &entry = (*ref).getFileEntry(); - if (Tree.IEP->Must_Expand(entry.tryGetRealPathName(), entry.getName())) { + const FileEntryRef &entry = *ref; + const FileEntry &fentry = ref->getFileEntry(); + if (Tree.IEP->Must_Expand(fentry.tryGetRealPathName(), entry.getName())) { /* Lie telling it is unreachable, which would force an expansion. */ return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/libcextract/MacroWalker.cpp new/clang-extract-0~20241220.8344124/libcextract/MacroWalker.cpp --- old/clang-extract-0~20241002.ec46efd/libcextract/MacroWalker.cpp 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/libcextract/MacroWalker.cpp 2024-12-20 21:31:15.000000000 +0100 @@ -98,7 +98,7 @@ { for (const IdentifierInfo *arg : info->params()) { StringRef arg_str = arg->getName(); - if (tok_str.equals(arg_str)) { + if (tok_str == arg_str) { return true; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/libcextract/PrettyPrint.cpp new/clang-extract-0~20241220.8344124/libcextract/PrettyPrint.cpp --- old/clang-extract-0~20241002.ec46efd/libcextract/PrettyPrint.cpp 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/libcextract/PrettyPrint.cpp 2024-12-20 21:31:15.000000000 +0100 @@ -125,7 +125,7 @@ /* If for some reason Get_Source_Text is unable to find the source range which comes this declaration because it is very complex, then fall back to AST dump. */ - if (decl_source.equals("")) { + if (decl_source == "") { /* TODO: warn user that we had to fallback to AST dump. */ if (TypedefNameDecl *typedecl = dyn_cast<TypedefNameDecl>(decl)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/libcextract/SymbolExternalizer.cpp new/clang-extract-0~20241220.8344124/libcextract/SymbolExternalizer.cpp --- old/clang-extract-0~20241002.ec46efd/libcextract/SymbolExternalizer.cpp 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/libcextract/SymbolExternalizer.cpp 2024-12-20 21:31:15.000000000 +0100 @@ -403,7 +403,12 @@ FileID begin_id = SM.getFileID(loc); /* Insert into the list of FileIDs. */ - const FileEntry *fentry = SM.getFileEntryForID(begin_id); + OptionalFileEntryRef fentry_ref = SM.getFileEntryRefForID(begin_id); + const FileEntry *fentry = nullptr; + + if (fentry_ref.has_value()) { + fentry = &fentry_ref->getFileEntry(); + } /* There are some cases where the fentry is known to return NULL. Check if those are the cases we already acknownledged. */ @@ -424,7 +429,7 @@ /* Insert the FileEntry if we don't have one. */ if (FileEntryMap.find(fentry) == FileEntryMap.end()) { /* Insert it. */ - FileEntryMap[fentry] = begin_id; + FileEntryMap[fentry] = std::pair(begin_id, fentry_ref->getName()); return true; } @@ -490,7 +495,7 @@ /* const FileEntry *fentry = it->first; */ - FileID id = it->second; + FileID id = it->second.first; /* Our updated file buffer. */ const RewriteBuffer *rewritebuf = RW.getRewriteBufferFor(id); @@ -676,8 +681,8 @@ because it may translate to the FileID that do not contain any changed buffer. Hence we do our own thing here, which is look at our own FileEntry => FileID that we are sure to have modifications. */ - const FileEntry *fentry = it->first; - FileID id = it->second; + FileID id = it->second.first; + StringRef filename = it->second.second; const RewriteBuffer *rewritebuf = RW.getRewriteBufferFor(id); @@ -690,15 +695,14 @@ it to the SourceManager. */ std::string modified_str = std::string(rewritebuf->begin(), rewritebuf->end()); - if (new_mfs->addFile(fentry->getName(), + if (new_mfs->addFile(filename, 0, MemoryBuffer::getMemBufferCopy(modified_str)) == false) { - llvm::outs() << "Unable to add " << fentry->getName() << " into InMemoryFS.\n"; + llvm::outs() << "Unable to add " << filename << " into InMemoryFS.\n"; } /* In case this is not the main file, we need to mark it for expansion. */ if (id != sm.getMainFileID()) { - StringRef file_name = fentry->getName(); - includes_to_expand.push_back(file_name.str()); + includes_to_expand.push_back(filename.str()); } else { main_file_inserted = true; } @@ -710,12 +714,14 @@ /* Make sure we inserted the main file. */ if (main_file_inserted == false) { FileID id = sm.getMainFileID(); - const FileEntry *fentry = sm.getFileEntryForID(id); + OptionalFileEntryRef fentry_ref = sm.getFileEntryRefForID(id); + StringRef filename = fentry_ref->getName(); + const std::string &main_file_content = Get_Modifications_To_Main_File(); - if (new_mfs->addFile(fentry->getName(), + if (new_mfs->addFile(filename, 0, MemoryBuffer::getMemBufferCopy(main_file_content)) == false) { - llvm::outs() << "Unable to add " << fentry->getName() << " into InMemoryFS.\n"; + llvm::outs() << "Unable to add " << filename << " into InMemoryFS.\n"; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/libcextract/SymbolExternalizer.hh new/clang-extract-0~20241220.8344124/libcextract/SymbolExternalizer.hh --- old/clang-extract-0~20241002.ec46efd/libcextract/SymbolExternalizer.hh 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/libcextract/SymbolExternalizer.hh 2024-12-20 21:31:15.000000000 +0100 @@ -225,7 +225,10 @@ void Commit(void); /* Get FileEntry map. */ - inline const std::unordered_map<const FileEntry *, FileID> &Get_FileEntry_Map(void) + typedef std::unordered_map<const FileEntry *, std::pair<FileID, StringRef>> + FileEntryMapType; + + inline const FileEntryMapType &Get_FileEntry_Map(void) { return FileEntryMap; } @@ -272,7 +275,7 @@ /* Our own mapping from FileEntry to FileID to get the modifications to the files. */ - std::unordered_map<const FileEntry *, FileID> FileEntryMap; + FileEntryMapType FileEntryMap; }; /** Class encapsulating the Symbol externalizer mechanism. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/ccp/ext-obj-5.c new/clang-extract-0~20241220.8344124/testsuite/ccp/ext-obj-5.c --- old/clang-extract-0~20241002.ec46efd/testsuite/ccp/ext-obj-5.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/ccp/ext-obj-5.c 2024-12-20 21:31:15.000000000 +0100 @@ -12,5 +12,5 @@ ee_o; } -/* { dg-final { scan-tree-dump "static char \(\*klpe_ee_o\)\[4\] __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static char \(\*klpe_ee_o\)\[4\] __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static char \(\*klpe_ee_o\)\[4\];" } } */ /* { dg-final { scan-tree-dump "char s\[sizeof\(\(\*klpe_ee_o\)\)\], t\[sizeof\(\(\*klpe_ee_o\)\)\]\[sizeof\(\(\*klpe_ee_o\)\)\];" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/includes/rewrite-1.c new/clang-extract-0~20241220.8344124/testsuite/includes/rewrite-1.c --- old/clang-extract-0~20241002.ec46efd/testsuite/includes/rewrite-1.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/includes/rewrite-1.c 2024-12-20 21:31:15.000000000 +0100 @@ -7,6 +7,6 @@ return f(); } -/* { dg-final { scan-tree-dump "static int \(\*klpe_f\)\(void\) __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \(\*klpe_f\)\(void\) __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \(\*klpe_f\)\(void\);" } } */ /* { dg-final { scan-tree-dump "\(\*klpe_f\)\(\)" } } */ /* { dg-final { scan-tree-dump-not "#include \"header-1.h\"" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/includes/rewrite-2.c new/clang-extract-0~20241220.8344124/testsuite/includes/rewrite-2.c --- old/clang-extract-0~20241002.ec46efd/testsuite/includes/rewrite-2.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/includes/rewrite-2.c 2024-12-20 21:31:15.000000000 +0100 @@ -7,6 +7,6 @@ return f(); } -/* { dg-final { scan-tree-dump "static int \(\*klpe_f\)\(void\) __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \(\*klpe_f\)\(void\) __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \(\*klpe_f\)\(void\);" } } */ /* { dg-final { scan-tree-dump "\(\*klpe_f\)\(\)" } } */ /* { dg-final { scan-tree-dump-not "#include \"header-1.h\"" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/includes/rewrite-4.c new/clang-extract-0~20241220.8344124/testsuite/includes/rewrite-4.c --- old/clang-extract-0~20241002.ec46efd/testsuite/includes/rewrite-4.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/includes/rewrite-4.c 2024-12-20 21:31:15.000000000 +0100 @@ -5,5 +5,5 @@ return f(); } -/* { dg-final { scan-tree-dump "static int \(\*klpe_f\)\(void\) __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \(\*klpe_f\)\(void\) __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \(\*klpe_f\)\(void\);" } } */ /* { dg-final { scan-tree-dump "\(\*klpe_f\)\(\)" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/lateext/lateext-2.c new/clang-extract-0~20241220.8344124/testsuite/lateext/lateext-2.c --- old/clang-extract-0~20241002.ec46efd/testsuite/lateext/lateext-2.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/lateext/lateext-2.c 2024-12-20 21:31:15.000000000 +0100 @@ -10,5 +10,5 @@ } /* { dg-final { scan-tree-dump "#define MACRO\n#include \"lateext-2.h\"\n#undef MACRO\n#include \"lateext-2.h\"" } } */ -/* { dg-final { scan-tree-dump "static int \(\*klpe_f\)\(void\) __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \(\*klpe_f\)\(void\) __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \(\*klpe_f\)\(void\);" } } */ /* { dg-final { scan-tree-dump "return \(\*klpe_f\)\(\) \+ g\(\);" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/lateext/lateext-3.c new/clang-extract-0~20241220.8344124/testsuite/lateext/lateext-3.c --- old/clang-extract-0~20241002.ec46efd/testsuite/lateext/lateext-3.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/lateext/lateext-3.c 2024-12-20 21:31:15.000000000 +0100 @@ -7,5 +7,5 @@ return inline_func(); } -/* { dg-final { scan-tree-dump "static int \*klpe_var __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \*klpe_var __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \*klpe_var;" } } */ /* { dg-final { scan-tree-dump-not "#include \"lateext-3.h\"" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/lateext/lateext-4.c new/clang-extract-0~20241220.8344124/testsuite/lateext/lateext-4.c --- old/clang-extract-0~20241002.ec46efd/testsuite/lateext/lateext-4.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/lateext/lateext-4.c 2024-12-20 21:31:15.000000000 +0100 @@ -10,5 +10,5 @@ } /* { dg-final { scan-tree-dump "#include \"lateext-4.h\"" } } */ -/* { dg-final { scan-tree-dump "static int \(\*klpe_g\)\(void\) __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \(\*klpe_g\)\(void\) __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \(\*klpe_g\)\(void\);" } } */ /* { dg-final { scan-tree-dump "return \(\*klpe_g\)\(\);" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/lateext/lateext-5.c new/clang-extract-0~20241220.8344124/testsuite/lateext/lateext-5.c --- old/clang-extract-0~20241002.ec46efd/testsuite/lateext/lateext-5.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/lateext/lateext-5.c 2024-12-20 21:31:15.000000000 +0100 @@ -10,5 +10,5 @@ } /* { dg-final { scan-tree-dump "#include \"lateext-4.h\"" } } */ -/* { dg-final { scan-tree-dump "static int \(\*klpe_g\)\(void\) __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \(\*klpe_g\)\(void\) __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \(\*klpe_g\)\(void\);" } } */ /* { dg-final { scan-tree-dump "return \(\*klpe_g\)\(\);" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/lateext/lateext-6.c new/clang-extract-0~20241220.8344124/testsuite/lateext/lateext-6.c --- old/clang-extract-0~20241002.ec46efd/testsuite/lateext/lateext-6.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/lateext/lateext-6.c 2024-12-20 21:31:15.000000000 +0100 @@ -11,5 +11,5 @@ } /* { dg-final { scan-tree-dump-not "int g\(void\)" } } */ -/* { dg-final { scan-tree-dump "static int \(\*klpe_g\)\(void\) __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \(\*klpe_g\)\(void\) __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \(\*klpe_g\)\(void\);" } } */ /* { dg-final { scan-tree-dump "return \(\*klpe_g\)\(\);" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/lateext/lateext-7.c new/clang-extract-0~20241220.8344124/testsuite/lateext/lateext-7.c --- old/clang-extract-0~20241002.ec46efd/testsuite/lateext/lateext-7.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/lateext/lateext-7.c 2024-12-20 21:31:15.000000000 +0100 @@ -10,4 +10,4 @@ } /* { dg-final { scan-tree-dump-not "DEFINE_STATIC_KEY_FALSE\(\*klpe_aaa\)" } } */ -/* { dg-final { scan-tree-dump "static struct AA \*klpe_aaa __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static struct AA \*klpe_aaa __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static struct AA \*klpe_aaa;" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/lateext/location-1.c new/clang-extract-0~20241220.8344124/testsuite/lateext/location-1.c --- old/clang-extract-0~20241002.ec46efd/testsuite/lateext/location-1.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/lateext/location-1.c 2024-12-20 21:31:15.000000000 +0100 @@ -7,5 +7,5 @@ return global; } -/* { dg-final { scan-tree-dump "static int \*klpe_global __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \*klpe_global __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \*klpe_global;" } } */ /* { dg-final { scan-tree-dump "clang-extract: from .*location-1.h:29:1" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-10.c new/clang-extract-0~20241220.8344124/testsuite/small/rename-10.c --- old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-10.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/small/rename-10.c 2024-12-20 21:31:15.000000000 +0100 @@ -8,5 +8,5 @@ return f(); } -/* { dg-final { scan-tree-dump "static int \(\*klpe_f\)\(\) __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \(\*klpe_f\)\(\) __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \(\*klpe_f\)\(\);" } } */ /* { dg-final { scan-tree-dump "return \(\*klpe_f\)\(\);" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-12.c new/clang-extract-0~20241220.8344124/testsuite/small/rename-12.c --- old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-12.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/small/rename-12.c 2024-12-20 21:31:15.000000000 +0100 @@ -11,5 +11,5 @@ } /* { dg-final { scan-tree-dump-not "static int g" } } */ -/* { dg-final { scan-tree-dump "static int \(\*klpe_g\)\(\) __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \(\*klpe_g\)\(\) __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \(\*klpe_g\)\(\);" } } */ /* { dg-final { scan-tree-dump "int klpp_f\(void\)\n{\n *return \(\*klpe_g\)\(\)" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-15.c new/clang-extract-0~20241220.8344124/testsuite/small/rename-15.c --- old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-15.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/small/rename-15.c 2024-12-20 21:31:15.000000000 +0100 @@ -18,4 +18,4 @@ } /* { dg-final { scan-tree-dump "return \(\*klpe_g\)\(3\);" } } */ -/* { dg-final { scan-tree-dump "static int \(\*klpe_g\)\(int\) __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \(\*klpe_g\)\(int\) __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \(\*klpe_g\)\(int\);" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-2.c new/clang-extract-0~20241220.8344124/testsuite/small/rename-2.c --- old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-2.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/small/rename-2.c 2024-12-20 21:31:15.000000000 +0100 @@ -11,5 +11,5 @@ } /* { dg-final { scan-tree-dump-not "static int g" } } */ -/* { dg-final { scan-tree-dump "static int \(\*klpe_g\)\(\) __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \(\*klpe_g\)\(\) __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \(\*klpe_g\)\(\);" } } */ /* { dg-final { scan-tree-dump "int f\(void\)\n{\n *return \(\*klpe_g\)\(\)" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-3.c new/clang-extract-0~20241220.8344124/testsuite/small/rename-3.c --- old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-3.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/small/rename-3.c 2024-12-20 21:31:15.000000000 +0100 @@ -7,5 +7,5 @@ return f(); } -/* { dg-final { scan-tree-dump "static int \(\*\*klpe_f\)\(void\) __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \(\*\*klpe_f\)\(void\) __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \(\*\*klpe_f\)\(void\);" } } */ /* { dg-final { scan-tree-dump "int g\(void\)\n{\n *return \(\*klpe_f\)\(\)" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-4.c new/clang-extract-0~20241220.8344124/testsuite/small/rename-4.c --- old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-4.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/small/rename-4.c 2024-12-20 21:31:15.000000000 +0100 @@ -12,5 +12,5 @@ return f(); } -/* { dg-final { scan-tree-dump "static int \(\*klpe_f\)\(\) __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \(\*klpe_f\)\(\) __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \(\*klpe_f\)\(\)" } } */ /* { dg-final { scan-tree-dump "return \(\*klpe_f\)\(\);" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-5.c new/clang-extract-0~20241220.8344124/testsuite/small/rename-5.c --- old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-5.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/small/rename-5.c 2024-12-20 21:31:15.000000000 +0100 @@ -1,5 +1,5 @@ /* { dg-options "-DCE_EXTRACT_FUNCTIONS=g -DCE_EXPORT_SYMBOLS=f" }*/ #include "rename-5.h" -/* { dg-final { scan-tree-dump "static int \(\*klpe_f\)\(\) __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \(\*klpe_f\)\(\) __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \(\*klpe_f\)\(\);" } } */ /* { dg-final { scan-tree-dump "return \(\*klpe_f\)\(\);" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-6.c new/clang-extract-0~20241220.8344124/testsuite/small/rename-6.c --- old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-6.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/small/rename-6.c 2024-12-20 21:31:15.000000000 +0100 @@ -11,6 +11,6 @@ return a; } -/* { dg-final { scan-tree-dump "static int \*klpe_a __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \*klpe_a __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \*klpe_a" } } */ /* { dg-final { scan-tree-dump "\(\*klpe_a\) = x;" } } */ /* { dg-final { scan-tree-dump "return \(\*klpe_a\);" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-8.c new/clang-extract-0~20241220.8344124/testsuite/small/rename-8.c --- old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-8.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/small/rename-8.c 2024-12-20 21:31:15.000000000 +0100 @@ -10,6 +10,6 @@ return A + B ; } -/* { dg-final { scan-tree-dump "static int \*klpe_bbb __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static int \*klpe_bbb __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static int \*klpe_bbb;" } } */ /* { dg-final { scan-tree-dump "#define A \(\*klpe_bbb\)" } } */ /* { dg-final { scan-tree-dump "#define B \(\*klpe_bbb\)" } } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-9.c new/clang-extract-0~20241220.8344124/testsuite/small/rename-9.c --- old/clang-extract-0~20241002.ec46efd/testsuite/small/rename-9.c 2024-10-02 14:34:10.000000000 +0200 +++ new/clang-extract-0~20241220.8344124/testsuite/small/rename-9.c 2024-12-20 21:31:15.000000000 +0100 @@ -10,5 +10,5 @@ return OPENSSL_strdup("aaa"); } -/* { dg-final { scan-tree-dump "static char \(\*klpe_CRYPTO_strdup\)\(const char \*, const char \*, int\) __attribute__\(\(used\)\);" } } */ +/* { dg-final { scan-tree-dump "static char \(\*klpe_CRYPTO_strdup\)\(const char \*, const char \*, int\) __attribute__\(\(used\)\);|__attribute__\(\(used\)\) static char \(\*klpe_CRYPTO_strdup\)\(const char \*, const char \*, int\);" } } */ /* { dg-final { scan-tree-dump "\(\*klpe_CRYPTO_strdup\)\(str," } } */
