dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Roll Clang to 3809e20afc68d7d03821f0ec59b928dcf9befbf4.

Browse Source 
Re-run clang-format.

TEST=ci
Change-Id: Ic277ea6baefa42bcc49ebce4f1099b910066cd4e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/370680
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
This commit is contained in:
Ryan Macnak
2024-06-10 20:38:30 +00:00
committed by Commit Queue
parent 6cfe153e1e
commit ea9eb67d54
15 changed files with 3523 additions and 2895 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DEPS
+1 -1
View File
@@ -76,7 +76,7 @@ vars = {
"jsc_tag": "version:278398",
# https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/clang
"clang_version": "git_revision:0f61051f541a5b8cfce25c84262dfdbadb9ca688",
"clang_version": "git_revision:3809e20afc68d7d03821f0ec59b928dcf9befbf4",
# https://chrome-infra-packages.appspot.com/p/gn/gn
"gn_version": "git_revision:f284b6b47039a2d7edfcbfc51f52664f82b5a789",
runtime/bin/ffi_test/ffi_test_functions.cc
+8 -6
View File
@@ -850,9 +850,10 @@ DART_EXPORT Struct20BytesHomogeneousInt32Copy PassStructRecursive(
Struct20BytesHomogeneousInt32Copy a0,
Struct20BytesHomogeneousInt32Copy (*f)(int64_t,
Struct20BytesHomogeneousInt32Copy)) {
std::cout << "PassStruct20BytesHomogeneousInt32x10" << "(" << recursionCounter
<< ", (" << a0.a0 << ", " << a0.a1 << ", " << a0.a2 << ", " << a0.a3
<< ", " << a0.a4 << "), " << reinterpret_cast<void*>(f) << ")\n";
std::cout << "PassStruct20BytesHomogeneousInt32x10"
<< "(" << recursionCounter << ", (" << a0.a0 << ", " << a0.a1
<< ", " << a0.a2 << ", " << a0.a3 << ", " << a0.a4 << "), "
<< reinterpret_cast<void*>(f) << ")\n";
a0.a0++;
const int32_t a0_a0_saved = a0.a0;
@@ -882,8 +883,8 @@ struct Struct8BytesNestedIntCopy {
};
DART_EXPORT void CallbackWithStruct(void (*f)(Struct8BytesNestedIntCopy)) {
std::cout << "CallbackWithStruct" << "(" << reinterpret_cast<void*>(f)
<< ")\n";
std::cout << "CallbackWithStruct"
<< "(" << reinterpret_cast<void*>(f) << ")\n";
Struct8BytesNestedIntCopy arg;
arg.a0.a0 = 10;
@@ -1272,7 +1273,8 @@ DART_EXPORT int64_t VariadicStructVarArgs(VarArgs a0, ...) {
VarArgs a1 = va_arg(var_args, VarArgs);
va_end(var_args);
std::cout << "VariadicStructVarArgs" << "(" << a0.a << ", " << a1.a << ")"
std::cout << "VariadicStructVarArgs"
<< "(" << a0.a << ", " << a1.a << ")"
<< "\n";
int64_t result = 0;
runtime/bin/ffi_test/ffi_test_functions_generated.cc
+3433 -2851
View File
File diff suppressed because it is too large Load Diff
runtime/vm/app_snapshot.cc
+3 -1
View File
@@ -7201,7 +7201,9 @@ class ProgramDeserializationRoots : public DeserializationRoots {
void PostLoad(Deserializer* d, const Array& refs) override {
auto isolate_group = d->isolate_group();
{ isolate_group->class_table()->CopySizesFromClassObjects(); }
{
isolate_group->class_table()->CopySizesFromClassObjects();
}
d->heap()->old_space()->EvaluateAfterLoading();
auto object_store = isolate_group->object_store();
runtime/vm/class_table.cc
+9 -3
View File
@@ -323,13 +323,19 @@ void ClassTable::AllocationProfilePrintJSON(JSONStream* stream, bool internal) {
if (internal) {
JSONObject heaps(&obj, "_heaps");
{ heap->PrintToJSONObject(Heap::kNew, &heaps); }
{ heap->PrintToJSONObject(Heap::kOld, &heaps); }
{
heap->PrintToJSONObject(Heap::kNew, &heaps);
}
{
heap->PrintToJSONObject(Heap::kOld, &heaps);
}
}
{
JSONObject memory(&obj, "memoryUsage");
{ heap->PrintMemoryUsageJSON(&memory); }
{
heap->PrintMemoryUsageJSON(&memory);
}
}
Thread* thread = Thread::Current();
runtime/vm/class_table.h
+3 -3
View File
@@ -589,9 +589,9 @@ class ClassTable : public MallocAllocated {
#ifndef PRODUCT
enum {
kTracingDisabled = 0,
kTraceAllocationBit = (1 << 0),
kCollectInstancesBit = (1 << 1),
kTracingDisabled = 0,
kTraceAllocationBit = (1 << 0),
kCollectInstancesBit = (1 << 1),
};
#endif // !PRODUCT
runtime/vm/heap/safepoint_test.cc
+21 -7
View File
@@ -100,7 +100,9 @@ class DeoptTask : public StateMachineTask {
protected:
virtual void RunInternal() {
data_->WaitUntil(kStartDeoptOperation);
{ DeoptSafepointOperationScope safepoint_operation(thread_); }
{
DeoptSafepointOperationScope safepoint_operation(thread_);
}
data_->MarkAndNotify(kFinishedDeoptOperation);
}
};
@@ -461,17 +463,29 @@ ISOLATE_UNIT_TEST_CASE(SafepointOperation_SafepointPointTest) {
threads[i]->MarkAndNotify(CheckinTask::kStartLoop);
}
{
{ GcSafepointOperationScope safepoint_operation(thread); }
{
GcSafepointOperationScope safepoint_operation(thread);
}
wait_for_sync(1); // Wait for threads to exit safepoint
{ DeoptSafepointOperationScope safepoint_operation(thread); }
{
DeoptSafepointOperationScope safepoint_operation(thread);
}
wait_for_sync(2); // Wait for threads to exit safepoint
{ RELOAD_OPERATION_SCOPE(thread); }
{
RELOAD_OPERATION_SCOPE(thread);
}
wait_for_sync(3); // Wait for threads to exit safepoint
{ GcSafepointOperationScope safepoint_operation(thread); }
{
GcSafepointOperationScope safepoint_operation(thread);
}
wait_for_sync(4); // Wait for threads to exit safepoint
{ DeoptSafepointOperationScope safepoint_operation(thread); }
{
DeoptSafepointOperationScope safepoint_operation(thread);
}
wait_for_sync(5); // Wait for threads to exit safepoint
{ RELOAD_OPERATION_SCOPE(thread); }
{
RELOAD_OPERATION_SCOPE(thread);
}
}
for (intptr_t i = 0; i < kTaskCount; i++) {
threads[i]->MarkAndNotify(CheckinTask::kPleaseExit);
runtime/vm/isolate.h
+14 -5
View File
@@ -1574,14 +1574,23 @@ class Isolate : public BaseIsolate, public IntrusiveDListEntry<Isolate> {
VMTagCounters vm_tag_counters_;
// We use 6 list entries for each pending service extension calls.
enum {kPendingHandlerIndex = 0, kPendingMethodNameIndex, kPendingKeysIndex,
kPendingValuesIndex, kPendingReplyPortIndex, kPendingIdIndex,
kPendingEntrySize};
enum {
kPendingHandlerIndex = 0,
kPendingMethodNameIndex,
kPendingKeysIndex,
kPendingValuesIndex,
kPendingReplyPortIndex,
kPendingIdIndex,
kPendingEntrySize
};
GrowableObjectArrayPtr pending_service_extension_calls_;
// We use 2 list entries for each registered extension handler.
enum {kRegisteredNameIndex = 0, kRegisteredHandlerIndex,
kRegisteredEntrySize};
enum {
kRegisteredNameIndex = 0,
kRegisteredHandlerIndex,
kRegisteredEntrySize
};
GrowableObjectArrayPtr registered_service_extension_handlers_;
// Used to wake the isolate when it is in the pause event loop.
runtime/vm/json_test.cc
+6 -2
View File
@@ -23,12 +23,16 @@ TEST_CASE(JSON_TextBuffer) {
TEST_CASE(JSON_JSONStream_Primitives) {
{
JSONStream js;
{ JSONObject jsobj(&js); }
{
JSONObject jsobj(&js);
}
EXPECT_STREQ("{}", js.ToCString());
}
{
JSONStream js;
{ JSONArray jsarr(&js); }
{
JSONArray jsarr(&js);
}
EXPECT_STREQ("[]", js.ToCString());
}
{
runtime/vm/kernel_isolate.h
+6 -2
View File
@@ -112,8 +112,12 @@ class KernelIsolate : public AllStatic {
static Dart_IsolateGroupCreateCallback create_group_callback_;
static Monitor* monitor_;
enum State{
kNotStarted, kStopped, kStarting, kStarted, kStopping,
enum State {
kNotStarted,
kStopped,
kStarting,
kStarted,
kStopping,
};
static State state_;
static Isolate* isolate_;
runtime/vm/native_arguments.h
+6 -3
View File
@@ -30,7 +30,8 @@ class Thread;
#elif defined(DART_HOST_OS_WINDOWS)
// The compiler may dynamically align the stack on Windows, so do not check.
#define CHECK_STACK_ALIGNMENT \
{}
{ \
}
#else
#define CHECK_STACK_ALIGNMENT \
{ \
@@ -49,9 +50,11 @@ class Thread;
#else
#define CHECK_STACK_ALIGNMENT \
{}
{ \
}
#define DEOPTIMIZE_ALOT \
{}
{ \
}
#endif
runtime/vm/object.h
+5 -3
View File
@@ -7002,9 +7002,11 @@ class Code : public Object {
explicit Comments(const Array& comments);
// Layout of entries describing comments.
enum {kPCOffsetEntry = 0, // PC offset to a comment as a Smi.
kCommentEntry, // Comment text as a String.
kNumberOfEntries};
enum {
kPCOffsetEntry = 0, // PC offset to a comment as a Smi.
kCommentEntry, // Comment text as a String.
kNumberOfEntries
};
const Array& comments_;
String& string_;
runtime/vm/regexp_parser.h
+1 -1
View File
@@ -63,7 +63,7 @@ class RegExpBuilder : public ZoneAllocated {
GrowableArray<RegExpTree*> text_;
GrowableArray<RegExpTree*> alternatives_;
#ifdef DEBUG
enum {ADD_NONE, ADD_CHAR, ADD_TERM, ADD_ASSERT, ADD_ATOM} last_added_;
enum { ADD_NONE, ADD_CHAR, ADD_TERM, ADD_ASSERT, ADD_ATOM } last_added_;
#define LAST(x) last_added_ = x;
#else
#define LAST(x)
runtime/vm/service_isolate.h
+5 -5
View File
@@ -85,11 +85,11 @@ class ServiceIsolate : public AllStatic {
static Dart_IsolateGroupCreateCallback create_group_callback_;
static Monitor* monitor_;
enum State{
kStopped,
kStarting,
kStarted,
kStopping,
enum State {
kStopped,
kStarting,
kStarted,
kStopping,
};
static State state_;
static Isolate* isolate_;
runtime/vm/tagged_pointer.h
+2 -2
View File
@@ -251,7 +251,7 @@ template <typename T>
struct is_uncompressed_ptr<
T,
typename std::enable_if<std::is_base_of<ObjectPtr, T>::value, void>::type>
: std::true_type {};
: std::true_type{};
template <typename T, typename Enable = void>
struct is_compressed_ptr : std::false_type {};
@@ -299,7 +299,7 @@ template <typename T>
struct is_compressed_ptr<
T,
typename std::enable_if<std::is_base_of<CompressedObjectPtr, T>::value,
void>::type> : std::true_type {};
void>::type> : std::true_type{};
template <typename T>
struct base_ptr_type<
T,