diff --git a/clang/blink_gc_plugin/DiagnosticsReporter.cpp b/clang/blink_gc_plugin/DiagnosticsReporter.cpp index f72eddf041d09ceae15b330056385389cf0b7e18..38d22eb7a501ebaf787fd08b53ce3baf424cdace 100644 --- a/clang/blink_gc_plugin/DiagnosticsReporter.cpp +++ b/clang/blink_gc_plugin/DiagnosticsReporter.cpp @@ -424,8 +424,9 @@ bool DiagnosticsReporter::hasErrorOccurred() const } DiagnosticsEngine::Level DiagnosticsReporter::getErrorLevel() const { - return diagnostic_.getWarningsAsErrors() ? DiagnosticsEngine::Error - : DiagnosticsEngine::Warning; + return DiagnosticsEngine::Warning; + // return diagnostic_.getWarningsAsErrors() ? DiagnosticsEngine::Error + // : DiagnosticsEngine::Warning; } void DiagnosticsReporter::ClassMustLeftMostlyDeriveGC( diff --git a/clang/raw_ptr_plugin/FindBadRawPtrPatterns.cpp b/clang/raw_ptr_plugin/FindBadRawPtrPatterns.cpp index 7eddbfc2dba1301a9949c0616b4b64541cdde5ff..b4242aebcf7f813e0cf77d32a6d4d2bc0dcf1f8a 100644 --- a/clang/raw_ptr_plugin/FindBadRawPtrPatterns.cpp +++ b/clang/raw_ptr_plugin/FindBadRawPtrPatterns.cpp @@ -44,7 +44,8 @@ class BadCastMatcher : public MatchFinder::MatchCallback { exclude_files_(exclude_files), exclude_functions_(exclude_functions) { error_bad_cast_signature_ = compiler_.getDiagnostics().getCustomDiagID( - clang::DiagnosticsEngine::Error, kBadCastDiagnostic); + // clang::DiagnosticsEngine::Error, kBadCastDiagnostic); + clang::DiagnosticsEngine::Warning, kBadCastDiagnostic); note_bad_cast_signature_explanation_ = compiler_.getDiagnostics().getCustomDiagID( clang::DiagnosticsEngine::Note, kBadCastDiagnosticNoteExplanation); @@ -135,7 +136,8 @@ class RawPtrFieldMatcher : public MatchFinder::MatchCallback { const RawPtrAndRefExclusionsOptions& exclusion_options) : compiler_(compiler), exclusion_options_(exclusion_options) { error_need_raw_ptr_signature_ = compiler_.getDiagnostics().getCustomDiagID( - clang::DiagnosticsEngine::Error, kNeedRawPtrSignature); + // clang::DiagnosticsEngine::Error, kNeedRawPtrSignature); + clang::DiagnosticsEngine::Warning, kNeedRawPtrSignature); } void Register(MatchFinder& match_finder) { @@ -176,7 +178,8 @@ class RawRefFieldMatcher : public MatchFinder::MatchCallback { const RawPtrAndRefExclusionsOptions& exclusion_options) : compiler_(compiler), exclusion_options_(exclusion_options) { error_need_raw_ref_signature_ = compiler_.getDiagnostics().getCustomDiagID( - clang::DiagnosticsEngine::Error, kNeedRawRefSignature); + // clang::DiagnosticsEngine::Error, kNeedRawRefSignature); + clang::DiagnosticsEngine::Warning, kNeedRawRefSignature); } void Register(MatchFinder& match_finder) { @@ -216,7 +219,8 @@ class RawPtrToStackAllocatedMatcher : public MatchFinder::MatchCallback { explicit RawPtrToStackAllocatedMatcher(clang::CompilerInstance& compiler) : compiler_(compiler), stack_allocated_predicate_() { error_no_raw_ptr_to_stack_ = compiler_.getDiagnostics().getCustomDiagID( - clang::DiagnosticsEngine::Error, kNoRawPtrToStackAllocatedSignature); + // clang::DiagnosticsEngine::Error, kNoRawPtrToStackAllocatedSignature); + clang::DiagnosticsEngine::Warning, kNoRawPtrToStackAllocatedSignature); } void Register(MatchFinder& match_finder) { @@ -268,11 +272,13 @@ class SpanFieldMatcher : public MatchFinder::MatchCallback { const RawPtrAndRefExclusionsOptions& exclusion_options) : compiler_(compiler), exclusion_options_(exclusion_options) { error_need_span_signature_ = compiler_.getDiagnostics().getCustomDiagID( - clang::DiagnosticsEngine::Error, kNeedRawSpanSignature); - + // clang::DiagnosticsEngine::Error, kNeedRawSpanSignature); + clang::DiagnosticsEngine::Warning, kNeedRawSpanSignature); + error_need_container_span_signature_ = compiler_.getDiagnostics().getCustomDiagID( - clang::DiagnosticsEngine::Error, kNeedContainerSpanSignature); + // clang::DiagnosticsEngine::Error, kNeedContainerSpanSignature); + clang::DiagnosticsEngine::Warning, kNeedContainerSpanSignature); } void Register(MatchFinder& match_finder) { diff --git a/clang/raw_ptr_plugin/StackAllocatedChecker.cpp b/clang/raw_ptr_plugin/StackAllocatedChecker.cpp index a71ce05819d234b1d35c9fd4947c3a1003555379..e323e46ae5757acf92aa7ddb32d008793f719b0c 100644 --- a/clang/raw_ptr_plugin/StackAllocatedChecker.cpp +++ b/clang/raw_ptr_plugin/StackAllocatedChecker.cpp @@ -101,7 +101,8 @@ StackAllocatedChecker::StackAllocatedChecker(clang::CompilerInstance& compiler) : compiler_(compiler), stack_allocated_field_error_signature_( compiler.getDiagnostics().getCustomDiagID( - clang::DiagnosticsEngine::Error, + // clang::DiagnosticsEngine::Error, + clang::DiagnosticsEngine::Warning, kStackAllocatedFieldError)) {} void StackAllocatedChecker::Check(clang::CXXRecordDecl* record) { diff --git a/llvm-build/build.py b/llvm-build/build.py index e65ad1956fdf509db5b4712aa0312db4db497532..e5417b8f8142984ce26a964dd9e1a4e50bb1440d 100755 --- a/llvm-build/build.py +++ b/llvm-build/build.py @@ -2673,6 +2673,13 @@ class LlvmPackage(BuildUtils): src_lib_dir = os.path.join(llvm_install, 'lib') for root, dirs, files in os.walk(src_lib_dir): + relative_path = os.path.relpath(root, src_lib_dir) + parts = relative_path.split(os.sep) + + # 如果lib的下一层目录是x86_64-unknown-linux-gnu,则跳过处理 + if len(parts) >= 1 and parts[0] == "x86_64-unknown-linux-gnu": + continue + for file in files: if file == 'libc++.a': libcpp_path = os.path.join(root, file)