Skip to content

Commit 496a2bd

Browse files
rmacnak-googleCommit Queue
rmacnak-google
authored and
Commit Queue
committed
Roll clang to 49f39b349db181ca516eb0253462105ff0e2c634.
TEST=ci Change-Id: I38e9ad7b16ffb0a9d380c3ed23b17854dca5a32f Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/447440 Commit-Queue: Ryan Macnak <[email protected]> Reviewed-by: Alexander Aprelev <[email protected]>
1 parent afb6af2 commit 496a2bd

File tree

12 files changed

+53
-49
lines changed

12 files changed

+53
-49
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ vars = {
7575
"jsc_tag": "version:299913",
7676

7777
# https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/clang
78-
"clang_version": "git_revision:8c7a2ce01a77c96028fe2c8566f65c45ad9408d3",
78+
"clang_version": "git_revision:49f39b349db181ca516eb0253462105ff0e2c634",
7979

8080
# https://chrome-infra-packages.appspot.com/p/gn/gn
8181
"gn_version": "git_revision:5d0a4153b0bcc86c5a23310d5b648a587be3c56d",

‎build/config/compiler/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ config("compiler") {
145145
if (is_mac && (is_asan || is_lsan || is_tsan || is_ubsan)) {
146146
ldflags += [
147147
"-rpath",
148-
"buildtools/mac-$host_cpu/clang/lib/clang/21/lib/darwin",
148+
"buildtools/mac-$host_cpu/clang/lib/clang/22/lib/darwin",
149149
]
150150
}
151151

‎runtime/vm/code_patcher_x64.cc‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@ static void MatchCallPattern(uword* pc) {
8484
static void MatchDataLoadFromPool(uword* pc, intptr_t* data_index) {
8585
// movq RBX, [PP + offset]
8686
static int16_t load_data_disp8[] = {
87-
0x49, 0x8b, 0x5f, -1, //
87+
0x49,
88+
0x8b,
89+
0x5f,
90+
-1, //
8891
};
8992
static int16_t load_data_disp32[] = {
9093
0x49, 0x8b, 0x9f, -1, -1, -1, -1,
@@ -334,7 +337,10 @@ class SwitchableCall : public SwitchableCallBase {
334337

335338
// movq CODE_REG, [PP + offset]
336339
static int16_t load_code_disp8[] = {
337-
0x4d, 0x8b, 0x67, -1, //
340+
0x4d,
341+
0x8b,
342+
0x67,
343+
-1, //
338344
};
339345
static int16_t load_code_disp32[] = {
340346
0x4d, 0x8b, 0xa7, -1, -1, -1, -1,
@@ -374,7 +380,8 @@ class BareSwitchableCall : public SwitchableCallBase {
374380

375381
// callq RCX
376382
static int16_t call_pattern[] = {
377-
0xff, 0xd1, //
383+
0xff,
384+
0xd1, //
378385
};
379386
if (MatchesPattern(pc, call_pattern, ARRAY_SIZE(call_pattern))) {
380387
pc -= ARRAY_SIZE(call_pattern);
@@ -384,7 +391,10 @@ class BareSwitchableCall : public SwitchableCallBase {
384391

385392
// movq RBX, [PP + offset]
386393
static int16_t load_data_disp8[] = {
387-
0x49, 0x8b, 0x5f, -1, //
394+
0x49,
395+
0x8b,
396+
0x5f,
397+
-1, //
388398
};
389399
static int16_t load_data_disp32[] = {
390400
0x49, 0x8b, 0x9f, -1, -1, -1, -1,
@@ -403,7 +413,10 @@ class BareSwitchableCall : public SwitchableCallBase {
403413

404414
// movq RCX, [PP + offset]
405415
static int16_t load_code_disp8[] = {
406-
0x49, 0x8b, 0x4f, -1, //
416+
0x49,
417+
0x8b,
418+
0x4f,
419+
-1, //
407420
};
408421
static int16_t load_code_disp32[] = {
409422
0x49, 0x8b, 0x8f, -1, -1, -1, -1,

‎runtime/vm/compiler/backend/il_printer.cc‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,17 @@ class IlTestPrinter : public AllStatic {
199199
#undef DECLARE_VISIT_INSTRUCTION
200200

201201
private:
202-
void WriteAttribute(const char* value) { writer_->PrintValue(value); }
202+
void WriteAttribute(const char* value) {
203+
writer_->PrintValue(value);
204+
}
203205

204-
void WriteAttribute(intptr_t value) { writer_->PrintValue(value); }
206+
void WriteAttribute(intptr_t value) {
207+
writer_->PrintValue(value);
208+
}
205209

206-
void WriteAttribute(bool value) { writer_->PrintValueBool(value); }
210+
void WriteAttribute(bool value) {
211+
writer_->PrintValueBool(value);
212+
}
207213

208214
void WriteAttribute(Token::Kind kind) {
209215
writer_->PrintValue(Token::Str(kind));
@@ -245,7 +251,9 @@ class IlTestPrinter : public AllStatic {
245251
writer_->PrintValue(LocationKindAsString(loc));
246252
}
247253

248-
void WriteAttribute(const Slot* slot) { writer_->PrintValue(slot->Name()); }
254+
void WriteAttribute(const Slot* slot) {
255+
writer_->PrintValue(slot->Name());
256+
}
249257

250258
void WriteAttribute(const Function* function) {
251259
writer_->PrintValue(function->QualifiedUserVisibleNameCString());

‎runtime/vm/compiler/backend/locations_helpers_test.cc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ class MockInstruction : public ZoneAllocated {
9090
public: \
9191
LocationSummary* MakeLocationSummary(Zone* zone, bool opt) const; \
9292
void EmitNativeCode(FlowGraphCompiler* compiler); \
93-
virtual intptr_t InputCount() const { \
94-
return Arity; \
95-
} \
93+
virtual intptr_t InputCount() const { return Arity; } \
9694
}; \
9795
TEST_CASE(LocationsHelpers_##Name) { \
9896
const Location expected_out = ExpectedOut; \

‎runtime/vm/compiler/compiler_pass.cc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@
3030
public: \
3131
CompilerPass_##Name() : CompilerPass(k##Name, #Name) {} \
3232
\
33-
static bool Register() { \
34-
return true; \
35-
} \
33+
static bool Register() { return true; } \
3634
\
3735
protected: \
3836
virtual bool DoBody(CompilerPassState* state) const { \

‎runtime/vm/constants_riscv.h‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1692,9 +1692,7 @@ class CInstr {
16921692
class name { \
16931693
public: \
16941694
constexpr explicit name(storage_t encoding) : encoding_(encoding) {} \
1695-
constexpr storage_t encoding() const { \
1696-
return encoding_; \
1697-
} \
1695+
constexpr storage_t encoding() const { return encoding_; } \
16981696
constexpr bool operator==(const name& other) const { \
16991697
return encoding_ == other.encoding_; \
17001698
} \
@@ -1715,18 +1713,14 @@ class CInstr {
17151713
constexpr /* implicit */ name##Set(name element) \
17161714
: encoding_(1u << element.encoding()) {} \
17171715
constexpr explicit name##Set(storage_t encoding) : encoding_(encoding) {} \
1718-
constexpr static name##Set Empty() { \
1719-
return name##Set(0); \
1720-
} \
1716+
constexpr static name##Set Empty() { return name##Set(0); } \
17211717
constexpr bool Includes(const name r) const { \
17221718
return (encoding_ & (1 << r.encoding())) != 0; \
17231719
} \
17241720
constexpr bool IncludesAll(const name##Set other) const { \
17251721
return (encoding_ & other.encoding_) == other.encoding_; \
17261722
} \
1727-
constexpr bool IsEmpty() const { \
1728-
return encoding_ == 0; \
1729-
} \
1723+
constexpr bool IsEmpty() const { return encoding_ == 0; } \
17301724
constexpr bool operator==(const name##Set& other) const { \
17311725
return encoding_ == other.encoding_; \
17321726
} \

‎runtime/vm/instructions_x64.cc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,18 @@ bool DecodeLoadObjectFromPoolOrThread(uword pc, const Code& code, Object* obj) {
7373

7474
intptr_t TypeTestingStubCallPattern::GetSubtypeTestCachePoolIndex() {
7575
static int16_t indirect_call_pattern[] = {
76-
0xff, -1 /* 0x53 or 0x56 */, 0x07, // callq [RBX/RSI + 0x7]
76+
0xff,
77+
-1 /* 0x53 or 0x56 */,
78+
0x07, // callq [RBX/RSI + 0x7]
7779
};
7880
static int16_t direct_call_pattern[] = {
7981
0xe8, -1, -1, -1, -1, // callq [PC + <offset>]
8082
};
8183
static int16_t pattern_disp8[] = {
82-
0x4d, 0x8b, 0x4f, -1, // movq R9, [PP + offset]
84+
0x4d,
85+
0x8b,
86+
0x4f,
87+
-1, // movq R9, [PP + offset]
8388
};
8489
static int16_t pattern_disp32[] = {
8590
0x4d, 0x8b, 0x8f, -1, -1, -1, -1, // movq R9, [PP + offset]

‎runtime/vm/reusable_handles.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ namespace dart {
5959
public: \
6060
explicit Reusable##name##HandleScope(Thread* thread = Thread::Current()) \
6161
: handle_(thread->name##_handle_) {} \
62-
~Reusable##name##HandleScope() { \
63-
handle_->ptr_ = name::null(); \
64-
} \
62+
~Reusable##name##HandleScope() { handle_->ptr_ = name::null(); } \
6563
name& Handle() const { \
6664
ASSERT(handle_ != nullptr); \
6765
return *handle_; \

‎runtime/vm/tagged_pointer.h‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -313,12 +313,8 @@ struct base_ptr_type<
313313
#define DEFINE_COMPRESSED_POINTER(klass, base) \
314314
class Compressed##klass##Ptr : public Compressed##base##Ptr { \
315315
public: \
316-
Compressed##klass##Ptr* operator->() { \
317-
return this; \
318-
} \
319-
const Compressed##klass##Ptr* operator->() const { \
320-
return this; \
321-
} \
316+
Compressed##klass##Ptr* operator->() { return this; } \
317+
const Compressed##klass##Ptr* operator->() const { return this; } \
322318
explicit Compressed##klass##Ptr(klass##Ptr uncompressed) \
323319
: Compressed##base##Ptr(uncompressed) {} \
324320
const klass##Ptr& operator=(const klass##Ptr& other) { \
@@ -335,12 +331,8 @@ struct base_ptr_type<
335331
class Untagged##klass; \
336332
class klass##Ptr : public base##Ptr { \
337333
public: \
338-
klass##Ptr* operator->() { \
339-
return this; \
340-
} \
341-
const klass##Ptr* operator->() const { \
342-
return this; \
343-
} \
334+
klass##Ptr* operator->() { return this; } \
335+
const klass##Ptr* operator->() const { return this; } \
344336
Untagged##klass* untag() { \
345337
return reinterpret_cast<Untagged##klass*>(untagged_pointer()); \
346338
} \
@@ -358,9 +350,7 @@ struct base_ptr_type<
358350
constexpr klass##Ptr(std::nullptr_t) : base##Ptr(nullptr) {} /* NOLINT */ \
359351
explicit klass##Ptr(const UntaggedObject* untagged) \
360352
: base##Ptr(reinterpret_cast<uword>(untagged) + kHeapObjectTag) {} \
361-
klass##Ptr Decompress(uword heap_base) const { \
362-
return *this; \
363-
} \
353+
klass##Ptr Decompress(uword heap_base) const { return *this; } \
364354
}; \
365355
DEFINE_COMPRESSED_POINTER(klass, base)
366356

0 commit comments

Comments
 (0)