Author: Cyndy Ishida Date: 2024-07-25T15:26:41-07:00 New Revision: 4ed543d414b6f39fb5302322eecb8abf33c76f89
URL: https://github.com/llvm/llvm-project/commit/4ed543d414b6f39fb5302322eecb8abf33c76f89 DIFF: https://github.com/llvm/llvm-project/commit/4ed543d414b6f39fb5302322eecb8abf33c76f89.diff LOG: [InstallAPI] Fix early return for scanning sub-directories (#100636) Added: clang/test/InstallAPI/directory-scanning-subdirectories.test Modified: clang/lib/InstallAPI/DirectoryScanner.cpp Removed: ################################################################################ diff --git a/clang/lib/InstallAPI/DirectoryScanner.cpp b/clang/lib/InstallAPI/DirectoryScanner.cpp index 8984758e7b446..03a8208c7364e 100644 --- a/clang/lib/InstallAPI/DirectoryScanner.cpp +++ b/clang/lib/InstallAPI/DirectoryScanner.cpp @@ -130,7 +130,8 @@ Error DirectoryScanner::scanHeaders(StringRef Path, Library &Lib, if (ParentPath.empty()) ParentPath = Path; for (const StringRef Dir : SubDirectories) - return scanHeaders(Dir, Lib, Type, BasePath, ParentPath); + if (Error Err = scanHeaders(Dir, Lib, Type, BasePath, ParentPath)) + return Err; return Error::success(); } diff --git a/clang/test/InstallAPI/directory-scanning-subdirectories.test b/clang/test/InstallAPI/directory-scanning-subdirectories.test new file mode 100644 index 0000000000000..3eac90440fa1e --- /dev/null +++ b/clang/test/InstallAPI/directory-scanning-subdirectories.test @@ -0,0 +1,61 @@ +; RUN: rm -rf %t +; RUN: split-file %s %t +; RUN: mkdir -p %t/DstRoot/ +; RUN: cp -r %S/Inputs/LibFoo/* %t/DstRoot/ + +; RUN: clang-installapi \ +; RUN: -target arm64-apple-macos12 -install_name @rpath/libfoo.dylib \ +; RUN: -current_version 1 -compatibility_version 1 \ +; RUN: -I%t/DstRoot/usr/include -dynamiclib \ +; RUN: -exclude-public-header %t/DstRoot/usr/include/public.h \ +; RUN: %t/DstRoot -o %t/output.tbd 2>&1 | FileCheck %s --allow-empty \ +; RUN: --implicit-check-not=error --implicit-check-not=warning +; RUN: llvm-readtapi --compare %t/output.tbd %t/expected.tbd + + +;--- DstRoot/usr/include/extra/extra.h +int extra(void); + +;--- DstRoot/usr/include/extra/additional/additional.h +int additional(void); + +;--- DstRoot/usr/include/more/more.h +int more(void); + +;--- DstRoot/usr/include/another/another.h +int another(void); + +;--- expected.tbd +{ + "main_library": { + "exported_symbols": [ + { + "text": { + "global": [ + "_foo", "_additional", "_more", + "_another", "_extra" + ] + } + } + ], + "flags": [ + { + "attributes": [ + "not_app_extension_safe" + ] + } + ], + "install_names": [ + { + "name": "@rpath/libfoo.dylib" + } + ], + "target_info": [ + { + "min_deployment": "12", + "target": "arm64-macos" + } + ] + }, + "tapi_tbd_version": 5 +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
