diff --git a/DEPS b/DEPS index eaddeda8803..7e4d031fcb5 100644 --- a/DEPS +++ b/DEPS @@ -75,7 +75,7 @@ vars = { "jsc_tag": "version:299913", # https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/clang - "clang_version": "git_revision:8c7a2ce01a77c96028fe2c8566f65c45ad9408d3", + "clang_version": "git_revision:49f39b349db181ca516eb0253462105ff0e2c634", # https://chrome-infra-packages.appspot.com/p/gn/gn "gn_version": "git_revision:5d0a4153b0bcc86c5a23310d5b648a587be3c56d", diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index 31bbe76afec..bbbdfb9afb1 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -145,7 +145,7 @@ config("compiler") { if (is_mac && (is_asan || is_lsan || is_tsan || is_ubsan)) { ldflags += [ "-rpath", - "buildtools/mac-$host_cpu/clang/lib/clang/21/lib/darwin", + "buildtools/mac-$host_cpu/clang/lib/clang/22/lib/darwin", ] } diff --git a/runtime/vm/code_patcher_x64.cc b/runtime/vm/code_patcher_x64.cc index 32dcecd26e1..c5abf415fe9 100644 --- a/runtime/vm/code_patcher_x64.cc +++ b/runtime/vm/code_patcher_x64.cc @@ -84,7 +84,10 @@ static void MatchCallPattern(uword* pc) { static void MatchDataLoadFromPool(uword* pc, intptr_t* data_index) { // movq RBX, [PP + offset] static int16_t load_data_disp8[] = { - 0x49, 0x8b, 0x5f, -1, // + 0x49, + 0x8b, + 0x5f, + -1, // }; static int16_t load_data_disp32[] = { 0x49, 0x8b, 0x9f, -1, -1, -1, -1, @@ -334,7 +337,10 @@ class SwitchableCall : public SwitchableCallBase { // movq CODE_REG, [PP + offset] static int16_t load_code_disp8[] = { - 0x4d, 0x8b, 0x67, -1, // + 0x4d, + 0x8b, + 0x67, + -1, // }; static int16_t load_code_disp32[] = { 0x4d, 0x8b, 0xa7, -1, -1, -1, -1, @@ -374,7 +380,8 @@ class BareSwitchableCall : public SwitchableCallBase { // callq RCX static int16_t call_pattern[] = { - 0xff, 0xd1, // + 0xff, + 0xd1, // }; if (MatchesPattern(pc, call_pattern, ARRAY_SIZE(call_pattern))) { pc -= ARRAY_SIZE(call_pattern); @@ -384,7 +391,10 @@ class BareSwitchableCall : public SwitchableCallBase { // movq RBX, [PP + offset] static int16_t load_data_disp8[] = { - 0x49, 0x8b, 0x5f, -1, // + 0x49, + 0x8b, + 0x5f, + -1, // }; static int16_t load_data_disp32[] = { 0x49, 0x8b, 0x9f, -1, -1, -1, -1, @@ -403,7 +413,10 @@ class BareSwitchableCall : public SwitchableCallBase { // movq RCX, [PP + offset] static int16_t load_code_disp8[] = { - 0x49, 0x8b, 0x4f, -1, // + 0x49, + 0x8b, + 0x4f, + -1, // }; static int16_t load_code_disp32[] = { 0x49, 0x8b, 0x8f, -1, -1, -1, -1, diff --git a/runtime/vm/compiler/backend/il_printer.cc b/runtime/vm/compiler/backend/il_printer.cc index b86084b8a2e..194c75319a5 100644 --- a/runtime/vm/compiler/backend/il_printer.cc +++ b/runtime/vm/compiler/backend/il_printer.cc @@ -199,11 +199,17 @@ class IlTestPrinter : public AllStatic { #undef DECLARE_VISIT_INSTRUCTION private: - void WriteAttribute(const char* value) { writer_->PrintValue(value); } + void WriteAttribute(const char* value) { + writer_->PrintValue(value); + } - void WriteAttribute(intptr_t value) { writer_->PrintValue(value); } + void WriteAttribute(intptr_t value) { + writer_->PrintValue(value); + } - void WriteAttribute(bool value) { writer_->PrintValueBool(value); } + void WriteAttribute(bool value) { + writer_->PrintValueBool(value); + } void WriteAttribute(Token::Kind kind) { writer_->PrintValue(Token::Str(kind)); @@ -245,7 +251,9 @@ class IlTestPrinter : public AllStatic { writer_->PrintValue(LocationKindAsString(loc)); } - void WriteAttribute(const Slot* slot) { writer_->PrintValue(slot->Name()); } + void WriteAttribute(const Slot* slot) { + writer_->PrintValue(slot->Name()); + } void WriteAttribute(const Function* function) { writer_->PrintValue(function->QualifiedUserVisibleNameCString()); diff --git a/runtime/vm/compiler/backend/locations_helpers_test.cc b/runtime/vm/compiler/backend/locations_helpers_test.cc index 25053dbe385..75d4634da27 100644 --- a/runtime/vm/compiler/backend/locations_helpers_test.cc +++ b/runtime/vm/compiler/backend/locations_helpers_test.cc @@ -90,9 +90,7 @@ class MockInstruction : public ZoneAllocated { public: \ LocationSummary* MakeLocationSummary(Zone* zone, bool opt) const; \ void EmitNativeCode(FlowGraphCompiler* compiler); \ - virtual intptr_t InputCount() const { \ - return Arity; \ - } \ + virtual intptr_t InputCount() const { return Arity; } \ }; \ TEST_CASE(LocationsHelpers_##Name) { \ const Location expected_out = ExpectedOut; \ diff --git a/runtime/vm/compiler/compiler_pass.cc b/runtime/vm/compiler/compiler_pass.cc index 795cde3b99b..e3a8da8b43e 100644 --- a/runtime/vm/compiler/compiler_pass.cc +++ b/runtime/vm/compiler/compiler_pass.cc @@ -30,9 +30,7 @@ public: \ CompilerPass_##Name() : CompilerPass(k##Name, #Name) {} \ \ - static bool Register() { \ - return true; \ - } \ + static bool Register() { return true; } \ \ protected: \ virtual bool DoBody(CompilerPassState* state) const { \ diff --git a/runtime/vm/constants_riscv.h b/runtime/vm/constants_riscv.h index 6c987404fd7..1fbf119ea7e 100644 --- a/runtime/vm/constants_riscv.h +++ b/runtime/vm/constants_riscv.h @@ -1692,9 +1692,7 @@ class CInstr { class name { \ public: \ constexpr explicit name(storage_t encoding) : encoding_(encoding) {} \ - constexpr storage_t encoding() const { \ - return encoding_; \ - } \ + constexpr storage_t encoding() const { return encoding_; } \ constexpr bool operator==(const name& other) const { \ return encoding_ == other.encoding_; \ } \ @@ -1715,18 +1713,14 @@ class CInstr { constexpr /* implicit */ name##Set(name element) \ : encoding_(1u << element.encoding()) {} \ constexpr explicit name##Set(storage_t encoding) : encoding_(encoding) {} \ - constexpr static name##Set Empty() { \ - return name##Set(0); \ - } \ + constexpr static name##Set Empty() { return name##Set(0); } \ constexpr bool Includes(const name r) const { \ return (encoding_ & (1 << r.encoding())) != 0; \ } \ constexpr bool IncludesAll(const name##Set other) const { \ return (encoding_ & other.encoding_) == other.encoding_; \ } \ - constexpr bool IsEmpty() const { \ - return encoding_ == 0; \ - } \ + constexpr bool IsEmpty() const { return encoding_ == 0; } \ constexpr bool operator==(const name##Set& other) const { \ return encoding_ == other.encoding_; \ } \ diff --git a/runtime/vm/instructions_x64.cc b/runtime/vm/instructions_x64.cc index 569ee866414..38b69b33da6 100644 --- a/runtime/vm/instructions_x64.cc +++ b/runtime/vm/instructions_x64.cc @@ -73,13 +73,18 @@ bool DecodeLoadObjectFromPoolOrThread(uword pc, const Code& code, Object* obj) { intptr_t TypeTestingStubCallPattern::GetSubtypeTestCachePoolIndex() { static int16_t indirect_call_pattern[] = { - 0xff, -1 /* 0x53 or 0x56 */, 0x07, // callq [RBX/RSI + 0x7] + 0xff, + -1 /* 0x53 or 0x56 */, + 0x07, // callq [RBX/RSI + 0x7] }; static int16_t direct_call_pattern[] = { 0xe8, -1, -1, -1, -1, // callq [PC + ] }; static int16_t pattern_disp8[] = { - 0x4d, 0x8b, 0x4f, -1, // movq R9, [PP + offset] + 0x4d, + 0x8b, + 0x4f, + -1, // movq R9, [PP + offset] }; static int16_t pattern_disp32[] = { 0x4d, 0x8b, 0x8f, -1, -1, -1, -1, // movq R9, [PP + offset] diff --git a/runtime/vm/reusable_handles.h b/runtime/vm/reusable_handles.h index 066581440a8..8512f5ea1f3 100644 --- a/runtime/vm/reusable_handles.h +++ b/runtime/vm/reusable_handles.h @@ -59,9 +59,7 @@ namespace dart { public: \ explicit Reusable##name##HandleScope(Thread* thread = Thread::Current()) \ : handle_(thread->name##_handle_) {} \ - ~Reusable##name##HandleScope() { \ - handle_->ptr_ = name::null(); \ - } \ + ~Reusable##name##HandleScope() { handle_->ptr_ = name::null(); } \ name& Handle() const { \ ASSERT(handle_ != nullptr); \ return *handle_; \ diff --git a/runtime/vm/tagged_pointer.h b/runtime/vm/tagged_pointer.h index 9bef8e950ce..8712990f69b 100644 --- a/runtime/vm/tagged_pointer.h +++ b/runtime/vm/tagged_pointer.h @@ -313,12 +313,8 @@ struct base_ptr_type< #define DEFINE_COMPRESSED_POINTER(klass, base) \ class Compressed##klass##Ptr : public Compressed##base##Ptr { \ public: \ - Compressed##klass##Ptr* operator->() { \ - return this; \ - } \ - const Compressed##klass##Ptr* operator->() const { \ - return this; \ - } \ + Compressed##klass##Ptr* operator->() { return this; } \ + const Compressed##klass##Ptr* operator->() const { return this; } \ explicit Compressed##klass##Ptr(klass##Ptr uncompressed) \ : Compressed##base##Ptr(uncompressed) {} \ const klass##Ptr& operator=(const klass##Ptr& other) { \ @@ -335,12 +331,8 @@ struct base_ptr_type< class Untagged##klass; \ class klass##Ptr : public base##Ptr { \ public: \ - klass##Ptr* operator->() { \ - return this; \ - } \ - const klass##Ptr* operator->() const { \ - return this; \ - } \ + klass##Ptr* operator->() { return this; } \ + const klass##Ptr* operator->() const { return this; } \ Untagged##klass* untag() { \ return reinterpret_cast(untagged_pointer()); \ } \ @@ -358,9 +350,7 @@ struct base_ptr_type< constexpr klass##Ptr(std::nullptr_t) : base##Ptr(nullptr) {} /* NOLINT */ \ explicit klass##Ptr(const UntaggedObject* untagged) \ : base##Ptr(reinterpret_cast(untagged) + kHeapObjectTag) {} \ - klass##Ptr Decompress(uword heap_base) const { \ - return *this; \ - } \ + klass##Ptr Decompress(uword heap_base) const { return *this; } \ }; \ DEFINE_COMPRESSED_POINTER(klass, base) diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json index 40ce1912481..d81bf266ba5 100644 --- a/tools/bots/test_matrix.json +++ b/tools/bots/test_matrix.json @@ -136,9 +136,9 @@ "buildtools/linux-arm64/clang/bin/", "buildtools/linux-x64/clang/bin/", "buildtools/mac-arm64/clang/bin/", - "buildtools/mac-arm64/clang/lib/clang/21/lib/darwin/", + "buildtools/mac-arm64/clang/lib/clang/22/lib/darwin/", "buildtools/mac-x64/clang/bin/", - "buildtools/mac-x64/clang/lib/clang/21/lib/darwin/", + "buildtools/mac-x64/clang/lib/clang/22/lib/darwin/", "buildtools/win-x64/clang/bin/clang.exe", "buildtools/win-x64/clang/bin/lld-link.exe", "buildtools/win-x64/clang/bin/llvm-strip.exe", diff --git a/tools/build.py b/tools/build.py index db836ab45b6..49fd1248788 100755 --- a/tools/build.py +++ b/tools/build.py @@ -44,7 +44,7 @@ def BuildOptions(): other_group.add_argument("-j", type=int, help='Ninja -j option for RBE builds.', - default=200 if sys.platform == 'win32' else 500) + default=200 if sys.platform == 'win32' else 400) other_group.add_argument("-l", type=int, help='Ninja -l option for RBE builds.',