diff --git a/runtime/bin/console_posix.cc b/runtime/bin/console_posix.cc index f318ae1ef6a..0c795c49138 100644 --- a/runtime/bin/console_posix.cc +++ b/runtime/bin/console_posix.cc @@ -18,11 +18,9 @@ namespace dart { namespace bin { -void Console::SaveConfig() { -} +void Console::SaveConfig() {} -void Console::RestoreConfig() { -} +void Console::RestoreConfig() {} } // namespace bin } // namespace dart diff --git a/runtime/bin/dart_io_api_impl.cc b/runtime/bin/dart_io_api_impl.cc index a9b87c2cfa3..369bf2d4a1c 100644 --- a/runtime/bin/dart_io_api_impl.cc +++ b/runtime/bin/dart_io_api_impl.cc @@ -11,7 +11,7 @@ #include "bin/platform.h" #include "bin/process.h" #if !defined(DART_IO_SECURE_SOCKET_DISABLED) - #include "bin/secure_socket_filter.h" +#include "bin/secure_socket_filter.h" #endif #include "bin/thread.h" #include "bin/utils.h" diff --git a/runtime/bin/dfe.cc b/runtime/bin/dfe.cc index 797fc479b4d..898c29562c0 100644 --- a/runtime/bin/dfe.cc +++ b/runtime/bin/dfe.cc @@ -311,11 +311,10 @@ class KernelIRNode { KernelIRNode(uint8_t* kernel_ir, intptr_t kernel_size) : kernel_ir_(kernel_ir), kernel_size_(kernel_size) {} - ~KernelIRNode() { - free(kernel_ir_); - } + ~KernelIRNode() { free(kernel_ir_); } - static void Add(KernelIRNode** p_head, KernelIRNode** p_tail, + static void Add(KernelIRNode** p_head, + KernelIRNode** p_tail, KernelIRNode* node) { if (*p_head == nullptr) { *p_head = node; @@ -325,8 +324,7 @@ class KernelIRNode { *p_tail = node; } - static void Merge(KernelIRNode* head, uint8_t** p_bytes, - intptr_t* p_size) { + static void Merge(KernelIRNode* head, uint8_t** p_bytes, intptr_t* p_size) { intptr_t size = 0; for (KernelIRNode* node = head; node != nullptr; node = node->next_) { size = size + node->kernel_size_; diff --git a/runtime/bin/directory_fuchsia.cc b/runtime/bin/directory_fuchsia.cc index e553a2aa8f8..4b7107874ae 100644 --- a/runtime/bin/directory_fuchsia.cc +++ b/runtime/bin/directory_fuchsia.cc @@ -7,15 +7,15 @@ #include "bin/directory.h" -#include // NOLINT -#include // NOLINT -#include // NOLINT +#include // NOLINT +#include // NOLINT +#include // NOLINT #include // NOLINT -#include // NOLINT -#include // NOLINT -#include // NOLINT -#include // NOLINT -#include // NOLINT +#include // NOLINT +#include // NOLINT +#include // NOLINT +#include // NOLINT +#include // NOLINT #include "bin/crypto.h" #include "bin/dartutils.h" diff --git a/runtime/bin/eventhandler_fuchsia.cc b/runtime/bin/eventhandler_fuchsia.cc index 8a267c1a818..790646721c9 100644 --- a/runtime/bin/eventhandler_fuchsia.cc +++ b/runtime/bin/eventhandler_fuchsia.cc @@ -589,7 +589,7 @@ void EventHandlerImplementation::HandlePacket(zx_port_packet_t* pkt) { // Handle pkt->type == ZX_PKT_TYPE_SIGNAL_ONE LOG_INFO("HandlePacket: Got event packet: observed = %x\n", - pkt->signal.observed); + pkt->signal.observed); LOG_INFO("HandlePacket: Got event packet: count = %ld\n", pkt->signal.count); DescriptorInfo* di = reinterpret_cast(pkt->key); zx_signals_t observed = pkt->signal.observed; diff --git a/runtime/bin/eventhandler_win.cc b/runtime/bin/eventhandler_win.cc index c720994c8ee..1a179e2e981 100644 --- a/runtime/bin/eventhandler_win.cc +++ b/runtime/bin/eventhandler_win.cc @@ -130,8 +130,7 @@ Handle::Handle(intptr_t handle) read_thread_finished_(false), flags_(0) {} -Handle::~Handle() { -} +Handle::~Handle() {} bool Handle::CreateCompletionPort(HANDLE completion_port) { ASSERT(completion_port_ == INVALID_HANDLE_VALUE); diff --git a/runtime/bin/eventhandler_win.h b/runtime/bin/eventhandler_win.h index 11210a80749..90515770102 100644 --- a/runtime/bin/eventhandler_win.h +++ b/runtime/bin/eventhandler_win.h @@ -78,9 +78,7 @@ class OverlappedBuffer { SOCKET client() const { return client_; } char* GetBufferStart() { return reinterpret_cast(&buffer_data_); } int GetBufferSize() const { return buflen_; } - struct sockaddr* from() const { - return from_; - } + struct sockaddr* from() const { return from_; } socklen_t* from_len_addr() const { return from_len_addr_; } socklen_t from_len() const { return from_ == nullptr ? 0 : *from_len_addr_; } diff --git a/runtime/bin/ffi_test/ffi_test_functions.cc b/runtime/bin/ffi_test/ffi_test_functions.cc index 0fff07041ef..e43bafbc614 100644 --- a/runtime/bin/ffi_test/ffi_test_functions.cc +++ b/runtime/bin/ffi_test/ffi_test_functions.cc @@ -732,9 +732,9 @@ DART_EXPORT int64_t SumStruct9Uint8(Struct9Uint8 s9) { return s9.a0 + s9.a1 + s9.a2 + s9.a3 + s9.a4 + s9.a5 + s9.a6 + s9.a7 + s9.a8; } -DART_EXPORT int64_t SumReturnStruct9Uint8( - Struct9Uint8 (*callback)(Struct9Uint8*), - Struct9Uint8* in) { +DART_EXPORT int64_t +SumReturnStruct9Uint8(Struct9Uint8 (*callback)(Struct9Uint8*), + Struct9Uint8* in) { std::cout << "SumReturnStruct9Uint8 in (" << in->a0 << ", " << in->a1 << ", " << in->a2 << ", " << in->a3 << ", " << in->a4 << ", " << in->a5 << ", " << in->a6 << ", " << in->a7 << ", " << in->a8 << ")\n"; @@ -906,8 +906,8 @@ DART_EXPORT intptr_t TestSimpleAddition(intptr_t (*add)(int, int)) { //// Following tests are copied from above, with the role of Dart and C++ code //// reversed. -DART_EXPORT intptr_t TestIntComputation( - int64_t (*fn)(int8_t, int16_t, int32_t, int64_t)) { +DART_EXPORT intptr_t +TestIntComputation(int64_t (*fn)(int8_t, int16_t, int32_t, int64_t)) { const int64_t result = fn(125, 250, 500, 1000); std::cout << "result " << result << "\n"; CHECK_EQ(result, 625); @@ -916,8 +916,8 @@ DART_EXPORT intptr_t TestIntComputation( return 0; } -DART_EXPORT intptr_t TestUintComputation( - uint64_t (*fn)(uint8_t, uint16_t, uint32_t, uint64_t)) { +DART_EXPORT intptr_t +TestUintComputation(uint64_t (*fn)(uint8_t, uint16_t, uint32_t, uint64_t)) { CHECK_EQ(0x7FFFFFFFFFFFFFFFLL, fn(0, 0, 0, 0x7FFFFFFFFFFFFFFFLL)); CHECK_EQ(0x8000000000000000LL, fn(0, 0, 0, 0x8000000000000000LL)); CHECK_EQ(-1, (int64_t)fn(0, 0, 0, -1)); diff --git a/runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc b/runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc index a66574162f2..2c95652de67 100644 --- a/runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc +++ b/runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc @@ -1316,8 +1316,7 @@ DART_EXPORT void Regress216834909_SetAtExit(int64_t install) { Regress216834909_hang_at_exit = false; } } -#endif // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || - // defined(DART_HOST_OS_MACOS) +#endif DART_EXPORT bool IsNull(Dart_Handle object) { return Dart_IsNull(object); diff --git a/runtime/bin/file_fuchsia.cc b/runtime/bin/file_fuchsia.cc index d58881382f6..8661356e8b5 100644 --- a/runtime/bin/file_fuchsia.cc +++ b/runtime/bin/file_fuchsia.cc @@ -7,16 +7,16 @@ #include "bin/file.h" -#include // NOLINT -#include // NOLINT -#include // NOLINT +#include // NOLINT +#include // NOLINT +#include // NOLINT #include // NOLINT -#include // NOLINT -#include // NOLINT -#include // NOLINT -#include // NOLINT -#include // NOLINT -#include // NOLINT +#include // NOLINT +#include // NOLINT +#include // NOLINT +#include // NOLINT +#include // NOLINT +#include // NOLINT #include "bin/builtin.h" #include "bin/fdutils.h" @@ -254,8 +254,8 @@ File* File::Open(Namespace* namespc, const char* name, FileOpenMode mode) { } Utils::CStringUniquePtr File::UriToPath(const char* uri) { - const char* path = (strlen(uri) >= 8 && strncmp(uri, "file:///", 8) == 0) - ? uri + 7 : uri; + const char* path = + (strlen(uri) >= 8 && strncmp(uri, "file:///", 8) == 0) ? uri + 7 : uri; UriDecoder uri_decoder(path); if (uri_decoder.decoded() == nullptr) { errno = EINVAL; @@ -456,15 +456,15 @@ bool File::Copy(Namespace* namespc, if (NO_RETRY_EXPECTED(fstatat(oldns.fd(), oldns.path(), &st, 0)) != 0) { return false; } - const int old_fd = NO_RETRY_EXPECTED( - openat(oldns.fd(), oldns.path(), O_RDONLY | O_CLOEXEC)); + const int old_fd = + NO_RETRY_EXPECTED(openat(oldns.fd(), oldns.path(), O_RDONLY | O_CLOEXEC)); if (old_fd < 0) { return false; } NamespaceScope newns(namespc, new_path); const int new_fd = NO_RETRY_EXPECTED( - openat(newns.fd(), newns.path(), - O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, st.st_mode)); + openat(newns.fd(), newns.path(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, + st.st_mode)); if (new_fd < 0) { close(old_fd); return false; @@ -492,9 +492,7 @@ bool File::Copy(Namespace* namespc, return true; } -static bool StatHelper(Namespace* namespc, - const char* name, - struct stat* st) { +static bool StatHelper(Namespace* namespc, const char* name, struct stat* st) { NamespaceScope ns(namespc, name); if (NO_RETRY_EXPECTED(fstatat(ns.fd(), ns.path(), st, 0)) != 0) { return false; @@ -683,7 +681,7 @@ const char* File::StringEscapedPathSeparator() { } static int fd_is_valid(int fd) { - return NO_RETRY_EXPECTED(fcntl(fd, F_GETFD)) != -1 || errno != EBADF; + return NO_RETRY_EXPECTED(fcntl(fd, F_GETFD)) != -1 || errno != EBADF; } File::StdioHandleType File::GetStdioHandleType(int fd) { diff --git a/runtime/bin/file_linux.cc b/runtime/bin/file_linux.cc index c86b5837e66..f080dd6f38d 100644 --- a/runtime/bin/file_linux.cc +++ b/runtime/bin/file_linux.cc @@ -266,8 +266,8 @@ File* File::Open(Namespace* namespc, const char* name, FileOpenMode mode) { } Utils::CStringUniquePtr File::UriToPath(const char* uri) { - const char* path = (strlen(uri) >= 8 && strncmp(uri, "file:///", 8) == 0) - ? uri + 7 : uri; + const char* path = + (strlen(uri) >= 8 && strncmp(uri, "file:///", 8) == 0) ? uri + 7 : uri; UriDecoder uri_decoder(path); if (uri_decoder.decoded() == nullptr) { errno = EINVAL; diff --git a/runtime/bin/file_macos.cc b/runtime/bin/file_macos.cc index 7dd0eb12541..40cf176f06c 100644 --- a/runtime/bin/file_macos.cc +++ b/runtime/bin/file_macos.cc @@ -297,8 +297,8 @@ File* File::Open(Namespace* namespc, const char* name, FileOpenMode mode) { } Utils::CStringUniquePtr File::UriToPath(const char* uri) { - const char* path = (strlen(uri) >= 8 && strncmp(uri, "file:///", 8) == 0) - ? uri + 7 : uri; + const char* path = + (strlen(uri) >= 8 && strncmp(uri, "file:///", 8) == 0) ? uri + 7 : uri; UriDecoder uri_decoder(path); if (uri_decoder.decoded() == nullptr) { errno = EINVAL; @@ -610,7 +610,7 @@ const char* File::LinkTarget(Namespace* namespc, dest = DartUtils::ScopedCString(target_size + 1); } else { ASSERT(dest_size > 0); - if ((size_t)dest_size <= target_size) { + if (static_cast(dest_size) <= target_size) { return nullptr; } } diff --git a/runtime/bin/file_system_watcher_fuchsia.cc b/runtime/bin/file_system_watcher_fuchsia.cc index f6defa22e62..2f61f1d2471 100644 --- a/runtime/bin/file_system_watcher_fuchsia.cc +++ b/runtime/bin/file_system_watcher_fuchsia.cc @@ -26,15 +26,13 @@ bool FileSystemWatcher::IsSupported() { return false; } -void FileSystemWatcher::UnwatchPath(intptr_t id, intptr_t path_id) { -} +void FileSystemWatcher::UnwatchPath(intptr_t id, intptr_t path_id) {} intptr_t FileSystemWatcher::Init() { return 0; } -void FileSystemWatcher::Close(intptr_t id) { -} +void FileSystemWatcher::Close(intptr_t id) {} intptr_t FileSystemWatcher::WatchPath(intptr_t id, Namespace* namespc, diff --git a/runtime/bin/file_test.cc b/runtime/bin/file_test.cc index d91e335b774..fb34744cb64 100644 --- a/runtime/bin/file_test.cc +++ b/runtime/bin/file_test.cc @@ -27,8 +27,8 @@ TEST_CASE(Read) { TEST_CASE(OpenUri_RelativeFilename) { const char* kFilename = bin::test::GetFileName("runtime/bin/file_test.cc"); - char* encoded = reinterpret_cast(bin::DartUtils::ScopedCString( - strlen(kFilename) * 3 + 1)); + char* encoded = reinterpret_cast( + bin::DartUtils::ScopedCString(strlen(kFilename) * 3 + 1)); char* t = encoded; // percent-encode all characters 'c' for (const char* p = kFilename; *p != '\0'; p++) { @@ -58,8 +58,8 @@ TEST_CASE(OpenUri_AbsoluteFilename) { const char* kFilename = bin::File::GetCanonicalPath(nullptr, kRelativeFilename); EXPECT_NOTNULL(kFilename); - char* encoded = reinterpret_cast(bin::DartUtils::ScopedCString( - strlen(kFilename) * 3 + 1)); + char* encoded = reinterpret_cast( + bin::DartUtils::ScopedCString(strlen(kFilename) * 3 + 1)); char* t = encoded; // percent-encode all characters 'c' for (const char* p = kFilename; *p != '\0'; p++) { @@ -99,8 +99,8 @@ TEST_CASE(OpenUri_ValidUri) { EXPECT_NOTNULL(kAbsoluteFilename); const char* kFilename = Concat("file:///", kAbsoluteFilename); - char* encoded = reinterpret_cast(bin::DartUtils::ScopedCString( - strlen(kFilename) * 3 + 1)); + char* encoded = reinterpret_cast( + bin::DartUtils::ScopedCString(strlen(kFilename) * 3 + 1)); char* t = encoded; // percent-encode all characters 'c' for (const char* p = kFilename; *p != '\0'; p++) { @@ -141,8 +141,8 @@ TEST_CASE(OpenUri_UriWithSpaces) { EXPECT_NOTNULL(kAbsoluteFilename); const char* kFilename = Concat("file:///", kAbsoluteFilename); - char* encoded = reinterpret_cast(bin::DartUtils::ScopedCString( - strlen(kFilename) * 3 + 1)); + char* encoded = reinterpret_cast( + bin::DartUtils::ScopedCString(strlen(kFilename) * 3 + 1)); char* t = encoded; // percent-encode all spaces for (const char* p = kFilename; *p != '\0'; p++) { @@ -170,8 +170,8 @@ TEST_CASE(OpenUri_UriWithSpaces) { TEST_CASE(OpenUri_InvalidUriPercentEncoding) { const char* kFilename = bin::test::GetFileName("runtime/bin/file_test.cc"); - char* encoded = reinterpret_cast(bin::DartUtils::ScopedCString( - strlen(kFilename) * 3 + 1)); + char* encoded = reinterpret_cast( + bin::DartUtils::ScopedCString(strlen(kFilename) * 3 + 1)); char* t = encoded; // percent-encode all characters 'c' for (const char* p = kFilename; *p != '\0'; p++) { @@ -190,8 +190,8 @@ TEST_CASE(OpenUri_InvalidUriPercentEncoding) { TEST_CASE(OpenUri_TruncatedUriPercentEncoding) { const char* kFilename = bin::test::GetFileName("runtime/bin/file_test.cc"); - char* encoded = reinterpret_cast(bin::DartUtils::ScopedCString( - strlen(kFilename) * 3 + 1)); + char* encoded = reinterpret_cast( + bin::DartUtils::ScopedCString(strlen(kFilename) * 3 + 1)); char* t = encoded; // percent-encode all characters 'c' for (const char* p = kFilename; *p != '\0'; p++) { diff --git a/runtime/bin/file_win.cc b/runtime/bin/file_win.cc index d1132fd681b..f4105032dd0 100644 --- a/runtime/bin/file_win.cc +++ b/runtime/bin/file_win.cc @@ -9,16 +9,18 @@ #include #include -#include // NOLINT -#include // NOLINT -#include // NOLINT -#include // NOLINT -#include // NOLINT -#undef StrDup // defined in Shlwapi.h as StrDupW -#include // NOLINT -#include // NOLINT -#include // NOLINT +// clang-format off +#include // NOLINT +#include // NOLINT +#include // NOLINT +#include // NOLINT +#include // NOLINT +#undef StrDup // defined in Shlwapi.h as StrDupW +#include // NOLINT +#include // NOLINT +#include // NOLINT #include // NOLINT +// clang-format on #include "bin/builtin.h" #include "bin/crypto.h" @@ -744,7 +746,7 @@ static void FreeUUID(wchar_t* ptr) { RpcStringFreeW(&ptr); } -static std::unique_ptr GenerateUUIDString() { +static std::unique_ptr GenerateUUIDString() { UUID uuid; RPC_STATUS status = UuidCreateSequential(&uuid); if ((status != RPC_S_OK) && (status != RPC_S_UUID_LOCAL_ONLY)) { diff --git a/runtime/bin/filter.cc b/runtime/bin/filter.cc index 89443835995..6ea6fcdc80a 100644 --- a/runtime/bin/filter.cc +++ b/runtime/bin/filter.cc @@ -344,8 +344,9 @@ intptr_t ZLibDeflateFilter::Processed(uint8_t* buffer, stream_.avail_out = length; stream_.next_out = buffer; bool error = false; - switch ( - deflate(&stream_, end ? Z_FINISH : flush ? Z_SYNC_FLUSH : Z_NO_FLUSH)) { + switch (deflate(&stream_, end ? Z_FINISH + : flush ? Z_SYNC_FLUSH + : Z_NO_FLUSH)) { case Z_STREAM_END: case Z_BUF_ERROR: case Z_OK: { @@ -409,8 +410,9 @@ intptr_t ZLibInflateFilter::Processed(uint8_t* buffer, stream_.next_out = buffer; bool error = false; int v; - switch (v = inflate(&stream_, - end ? Z_FINISH : flush ? Z_SYNC_FLUSH : Z_NO_FLUSH)) { + switch (v = inflate(&stream_, end ? Z_FINISH + : flush ? Z_SYNC_FLUSH + : Z_NO_FLUSH)) { case Z_STREAM_END: case Z_BUF_ERROR: case Z_OK: { diff --git a/runtime/bin/loader.cc b/runtime/bin/loader.cc index 611b4a7a2cb..17ce67501fe 100644 --- a/runtime/bin/loader.cc +++ b/runtime/bin/loader.cc @@ -166,8 +166,7 @@ Dart_Handle Loader::DeferredLoadHandler(intptr_t loading_unit_id) { return result; } -void Loader::InitOnce() { -} +void Loader::InitOnce() {} } // namespace bin } // namespace dart diff --git a/runtime/bin/namespace_fuchsia.cc b/runtime/bin/namespace_fuchsia.cc index af2b7662bf1..3fa53995690 100644 --- a/runtime/bin/namespace_fuchsia.cc +++ b/runtime/bin/namespace_fuchsia.cc @@ -21,8 +21,7 @@ namespace dart { namespace bin { NamespaceImpl::NamespaceImpl(fdio_ns_t* fdio_ns) - : fdio_ns_(fdio_ns), - cwd_(strdup("/")) { + : fdio_ns_(fdio_ns), cwd_(strdup("/")) { rootfd_ = fdio_ns_opendir(fdio_ns); if (rootfd_ < 0) { FATAL("Failed to open file descriptor for namespace: errno=%d: %s", errno, diff --git a/runtime/bin/platform_macos.cc b/runtime/bin/platform_macos.cc index 4d0784ef0e8..b5215ad51de 100644 --- a/runtime/bin/platform_macos.cc +++ b/runtime/bin/platform_macos.cc @@ -12,7 +12,7 @@ #if !DART_HOST_OS_IOS #include -#endif // !DART_HOST_OS_IOS +#endif // !DART_HOST_OS_IOS #include #include #include diff --git a/runtime/bin/platform_win.cc b/runtime/bin/platform_win.cc index 06244ea56fc..afffde5289e 100644 --- a/runtime/bin/platform_win.cc +++ b/runtime/bin/platform_win.cc @@ -20,7 +20,6 @@ #include "bin/utils.h" #include "bin/utils_win.h" - namespace dart { namespace bin { diff --git a/runtime/bin/process_fuchsia.cc b/runtime/bin/process_fuchsia.cc index 485da95579c..b1f2ee03c95 100644 --- a/runtime/bin/process_fuchsia.cc +++ b/runtime/bin/process_fuchsia.cc @@ -624,14 +624,14 @@ class ProcessStarter { } fdio_spawn_action_t* actions; - const intptr_t actions_count = BuildSpawnActions( - namespc_->namespc()->fdio_ns(), &actions); + const intptr_t actions_count = + BuildSpawnActions(namespc_->namespc()->fdio_ns(), &actions); if (actions_count < 0) { zx_handle_close(vmo); close(exit_pipe_fds[0]); close(exit_pipe_fds[1]); - *os_error_message_ = DartUtils::ScopedCopyCString( - "Failed to build spawn actions array."); + *os_error_message_ = + DartUtils::ScopedCopyCString("Failed to build spawn actions array."); return ZX_ERR_IO; } @@ -703,7 +703,8 @@ class ProcessStarter { *os_error_message_ = message; } - zx_status_t AddPipe(int target_fd, int* local_fd, + zx_status_t AddPipe(int target_fd, + int* local_fd, fdio_spawn_action_t* action) { zx_status_t status = fdio_pipe_half(local_fd, &action->h.handle); if (status != ZX_OK) return status; @@ -763,16 +764,19 @@ class ProcessStarter { } return -1; } + // clang-format off actions[3] = { .action = FDIO_SPAWN_ACTION_SET_NAME, .name = { .data = program_arguments_[0], }, }; + // clang-format on // Then fill in the namespace actions. if (ns != nullptr) { for (size_t i = 0; i < flat_ns->count; i++) { + // clang-format off actions[fixed_actions_cnt + i] = { .action = FDIO_SPAWN_ACTION_ADD_NS_ENTRY, .ns = { @@ -780,6 +784,7 @@ class ProcessStarter { .handle = flat_ns->handle[i], }, }; + // clang-format on flat_ns->handle[i] = ZX_HANDLE_INVALID; } fdio_ns_free_flat_ns(flat_ns); diff --git a/runtime/bin/socket.cc b/runtime/bin/socket.cc index f61a7372148..0de173f2b70 100644 --- a/runtime/bin/socket.cc +++ b/runtime/bin/socket.cc @@ -429,8 +429,8 @@ void FUNCTION_NAME(Socket_CreateUnixDomainBindConnect)( RawAddr addr; Dart_Handle address = Dart_GetNativeArgument(args, 1); if (Dart_IsNull(address)) { - Dart_SetReturnValue(args, - DartUtils::NewDartArgumentError("expect address to be of type String")); + Dart_SetReturnValue(args, DartUtils::NewDartArgumentError( + "expect address to be of type String")); } Dart_Handle result = SocketAddress::GetUnixDomainSockAddr( DartUtils::GetStringValue(address), Namespace::GetNamespace(args, 3), @@ -1025,8 +1025,8 @@ void FUNCTION_NAME(ServerSocket_CreateUnixDomainBindListen)( #else Dart_Handle address = Dart_GetNativeArgument(args, 1); if (Dart_IsNull(address)) { - Dart_SetReturnValue(args, - DartUtils::NewDartArgumentError("expect address to be of type String")); + Dart_SetReturnValue(args, DartUtils::NewDartArgumentError( + "expect address to be of type String")); } const char* path = DartUtils::GetStringValue(address); int64_t backlog = DartUtils::GetInt64ValueCheckRange( diff --git a/runtime/bin/socket.h b/runtime/bin/socket.h index 4da25e5b6a5..9a53d51774d 100644 --- a/runtime/bin/socket.h +++ b/runtime/bin/socket.h @@ -170,9 +170,7 @@ class ListeningSocketRegistry { unix_domain_sockets_(nullptr), mutex_() {} - ~ListeningSocketRegistry() { - CloseAllSafe(); - } + ~ListeningSocketRegistry() { CloseAllSafe(); } static void Initialize(); diff --git a/runtime/bin/socket_base_fuchsia.cc b/runtime/bin/socket_base_fuchsia.cc index f68f367db65..1d6002866d4 100644 --- a/runtime/bin/socket_base_fuchsia.cc +++ b/runtime/bin/socket_base_fuchsia.cc @@ -66,7 +66,6 @@ SocketAddress::SocketAddress(struct sockaddr* sa, bool unnamed_unix_socket) { memmove(reinterpret_cast(&addr_), sa, salen); } - bool SocketBase::Initialize() { // Nothing to do on Fuchsia. return true; diff --git a/runtime/bin/socket_macos.cc b/runtime/bin/socket_macos.cc index f91c4a940ad..0760f2f04e4 100644 --- a/runtime/bin/socket_macos.cc +++ b/runtime/bin/socket_macos.cc @@ -129,7 +129,6 @@ intptr_t Socket::CreateBindDatagram(const RawAddr& addr, return -1; } - if (reuseAddress) { int optval = 1; VOID_NO_RETRY_EXPECTED( diff --git a/runtime/bin/utils_macos.cc b/runtime/bin/utils_macos.cc index 9ce28f0a96d..8f7881f702e 100644 --- a/runtime/bin/utils_macos.cc +++ b/runtime/bin/utils_macos.cc @@ -10,8 +10,8 @@ #include // NOLINT #include // NOLINT #include // NOLINT -#include // NOLINT -#include // NOLINT +#include // NOLINT +#include // NOLINT #include "bin/utils.h" #include "platform/assert.h" diff --git a/runtime/include/bin/dart_io_api.h b/runtime/include/bin/dart_io_api.h index cc647976c9d..e863d8b9f00 100644 --- a/runtime/include/bin/dart_io_api.h +++ b/runtime/include/bin/dart_io_api.h @@ -5,7 +5,7 @@ #ifndef RUNTIME_INCLUDE_BIN_DART_IO_API_H_ #define RUNTIME_INCLUDE_BIN_DART_IO_API_H_ -#include "dart_tools_api.h" +#include "../dart_tools_api.h" namespace dart { namespace bin { diff --git a/runtime/include/dart_api.h b/runtime/include/dart_api.h index b3dccd78c67..6abe8c35de3 100644 --- a/runtime/include/dart_api.h +++ b/runtime/include/dart_api.h @@ -556,7 +556,6 @@ Dart_NewFinalizableHandle(Dart_Handle object, DART_EXPORT void Dart_DeleteFinalizableHandle(Dart_FinalizableHandle object, Dart_Handle strong_ref_to_object); - /* * ========================== * Initialization and Globals @@ -1278,8 +1277,7 @@ DART_EXPORT void Dart_KillIsolate(Dart_Isolate isolate); */ DART_EXPORT void Dart_NotifyIdle(int64_t deadline); -typedef void (*Dart_HeapSamplingReportCallback)(void* context, - void* data); +typedef void (*Dart_HeapSamplingReportCallback)(void* context, void* data); typedef void* (*Dart_HeapSamplingCreateCallback)( Dart_Isolate isolate, diff --git a/runtime/include/dart_embedder_api.h b/runtime/include/dart_embedder_api.h index e565ebf6ee9..bc03773409e 100644 --- a/runtime/include/dart_embedder_api.h +++ b/runtime/include/dart_embedder_api.h @@ -59,10 +59,7 @@ CreateKernelServiceIsolate(const IsolateCreationData& data, // Service isolate configuration. struct VmServiceConfiguration { - enum { - kBindHttpServerToAFreePort = 0, - kDoNotAutoStartHttpServer = -1 - }; + enum { kBindHttpServerToAFreePort = 0, kDoNotAutoStartHttpServer = -1 }; // Address to which HTTP server will be bound. const char* ip; diff --git a/runtime/include/dart_tools_api.h b/runtime/include/dart_tools_api.h index c36df9ff3fb..c118bc46de1 100644 --- a/runtime/include/dart_tools_api.h +++ b/runtime/include/dart_tools_api.h @@ -127,13 +127,13 @@ DART_EXPORT void Dart_RegisterRootServiceRequestCallback( * The pointers in this structure are not going to be cached or freed by the VM. */ - #define DART_EMBEDDER_INFORMATION_CURRENT_VERSION (0x00000001) +#define DART_EMBEDDER_INFORMATION_CURRENT_VERSION (0x00000001) typedef struct { int32_t version; - const char* name; // [optional] The name of the embedder + const char* name; // [optional] The name of the embedder int64_t current_rss; // [optional] the current RSS of the embedder - int64_t max_rss; // [optional] the maximum RSS of the embedder + int64_t max_rss; // [optional] the maximum RSS of the embedder } Dart_EmbedderInformation; /** diff --git a/runtime/platform/allocation.h b/runtime/platform/allocation.h index d732112eaa3..26001ac54f2 100644 --- a/runtime/platform/allocation.h +++ b/runtime/platform/allocation.h @@ -44,13 +44,9 @@ class MallocAllocated { // of memory. Don't do this when running under ASAN so it can continue to // check malloc/new/new[] are paired with free/delete/delete[] respectively. #if !defined(USING_ADDRESS_SANITIZER) - void* operator new(size_t size) { - return dart::malloc(size); - } + void* operator new(size_t size) { return dart::malloc(size); } - void* operator new[](size_t size) { - return dart::malloc(size); - } + void* operator new[](size_t size) { return dart::malloc(size); } void operator delete(void* pointer) { ::free(pointer); } diff --git a/runtime/platform/floating_point_win.cc b/runtime/platform/floating_point_win.cc index cf674346324..222420d3c55 100644 --- a/runtime/platform/floating_point_win.cc +++ b/runtime/platform/floating_point_win.cc @@ -33,9 +33,9 @@ double atan2_ieee(double x, double y) { int cls_y = _fpclass(y); if (((cls_x & (_FPCLASS_PINF | _FPCLASS_NINF)) != 0) && ((cls_y & (_FPCLASS_PINF | _FPCLASS_NINF)) != 0)) { - // atan2 values at infinities listed above are the same as values - // at (+/-1, +/-1). index_x is 0, when x is +infinity, 1 when x is -infinity. - // Same is with index_y. + // atan2 values at infinities listed above are the same as values at (+/-1, + // +/-1). index_x is 0, when x is +infinity, 1 when x is -infinity. Same is + // with index_y. int index_x = (cls_x & _FPCLASS_PINF) != 0 ? 0 : 1; int index_y = (cls_y & _FPCLASS_PINF) != 0 ? 0 : 1; static double atans_at_infinities[2][2] = { diff --git a/runtime/platform/safe_stack.h b/runtime/platform/safe_stack.h index d6aa08f9344..73844a1eda4 100644 --- a/runtime/platform/safe_stack.h +++ b/runtime/platform/safe_stack.h @@ -24,7 +24,8 @@ #endif #if defined(USING_SHADOW_CALL_STACK) -#define NO_SANITIZE_SHADOW_CALL_STACK __attribute__((no_sanitize("shadow-call-stack"))) +#define NO_SANITIZE_SHADOW_CALL_STACK \ + __attribute__((no_sanitize("shadow-call-stack"))) #else #define NO_SANITIZE_SHADOW_CALL_STACK #endif diff --git a/runtime/platform/unwinding_records.h b/runtime/platform/unwinding_records.h index 12333ca025f..83d242a4984 100644 --- a/runtime/platform/unwinding_records.h +++ b/runtime/platform/unwinding_records.h @@ -99,8 +99,8 @@ struct CodeRangeUnwindingRecord { #pragma pack(pop) -#elif (defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS)) && \ - defined(TARGET_ARCH_ARM64) +#elif defined(TARGET_ARCH_ARM64) && \ + (defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS)) #pragma pack(push, 1) diff --git a/runtime/vm/bitmap.cc b/runtime/vm/bitmap.cc index 2febafee947..15dd19ca9f0 100644 --- a/runtime/vm/bitmap.cc +++ b/runtime/vm/bitmap.cc @@ -5,8 +5,8 @@ #include "vm/bitmap.h" #include "platform/assert.h" -#include "vm/object.h" #include "vm/log.h" +#include "vm/object.h" namespace dart { diff --git a/runtime/vm/class_table.h b/runtime/vm/class_table.h index a772b72d749..3ca1237a897 100644 --- a/runtime/vm/class_table.h +++ b/runtime/vm/class_table.h @@ -444,16 +444,10 @@ class ClassTable : public MallocAllocated { } #endif // !defined(PRODUCT) || defined(FORCE_INCLUDE_SAMPLING_HEAP_PROFILER) - intptr_t NumCids() const { - return classes_.num_cids(); - } - intptr_t Capacity() const { - return classes_.capacity(); - } + intptr_t NumCids() const { return classes_.num_cids(); } + intptr_t Capacity() const { return classes_.capacity(); } - intptr_t NumTopLevelCids() const { - return top_level_classes_.num_cids(); - } + intptr_t NumTopLevelCids() const { return top_level_classes_.num_cids(); } void Register(const Class& cls); void AllocateIndex(intptr_t index); @@ -546,9 +540,7 @@ class ClassTable : public MallocAllocated { void AllocateTopLevelIndex(intptr_t index); - ClassPtr* table() { - return classes_.GetColumn(); - } + ClassPtr* table() { return classes_.GetColumn(); } // Used to drop recently added classes. void SetNumCids(intptr_t num_cids, intptr_t num_tlc_cids) { diff --git a/runtime/vm/compiler/asm_intrinsifier_arm.cc b/runtime/vm/compiler/asm_intrinsifier_arm.cc index 00e6b71b214..995790b2c76 100644 --- a/runtime/vm/compiler/asm_intrinsifier_arm.cc +++ b/runtime/vm/compiler/asm_intrinsifier_arm.cc @@ -63,12 +63,12 @@ void AsmIntrinsifier::Integer_shl(Assembler* assembler, Label* normal_ir_body) { // high bits = (((1 << R0) - 1) << (32 - R0)) & R1) >> (32 - R0) // lo bits = R1 << R0 __ LoadImmediate(R8, 1); - __ mov(R8, Operand(R8, LSL, R0)); // R8 <- 1 << R0 - __ sub(R8, R8, Operand(1)); // R8 <- R8 - 1 - __ rsb(R3, R0, Operand(32)); // R3 <- 32 - R0 - __ mov(R8, Operand(R8, LSL, R3)); // R8 <- R8 << R3 - __ and_(R8, R1, Operand(R8)); // R8 <- R8 & R1 - __ mov(R8, Operand(R8, LSR, R3)); // R8 <- R8 >> R3 + __ mov(R8, Operand(R8, LSL, R0)); // R8 <- 1 << R0 + __ sub(R8, R8, Operand(1)); // R8 <- R8 - 1 + __ rsb(R3, R0, Operand(32)); // R3 <- 32 - R0 + __ mov(R8, Operand(R8, LSL, R3)); // R8 <- R8 << R3 + __ and_(R8, R1, Operand(R8)); // R8 <- R8 & R1 + __ mov(R8, Operand(R8, LSR, R3)); // R8 <- R8 >> R3 // Now R8 has the bits that fall off of R1 on a left shift. __ mov(R1, Operand(R1, LSL, R0)); // R1 gets the low bits. diff --git a/runtime/vm/compiler/asm_intrinsifier_test.cc b/runtime/vm/compiler/asm_intrinsifier_test.cc index fb112f1aee8..ec661b61c90 100644 --- a/runtime/vm/compiler/asm_intrinsifier_test.cc +++ b/runtime/vm/compiler/asm_intrinsifier_test.cc @@ -8,6 +8,4 @@ #include "vm/symbols.h" #include "vm/unit_test.h" -namespace dart { - -} // namespace dart +namespace dart {} // namespace dart diff --git a/runtime/vm/compiler/asm_intrinsifier_x64.cc b/runtime/vm/compiler/asm_intrinsifier_x64.cc index 52944d10ad3..3dc27fd3701 100644 --- a/runtime/vm/compiler/asm_intrinsifier_x64.cc +++ b/runtime/vm/compiler/asm_intrinsifier_x64.cc @@ -1628,7 +1628,7 @@ static void TryAllocateString(Assembler* assembler, __ movq(RDI, length_reg); } Label pop_and_fail, not_zero_length; - __ pushq(RDI); // Preserve length. + __ pushq(RDI); // Preserve length. if (cid == kOneByteStringCid) { // Untag length. __ SmiUntag(RDI); diff --git a/runtime/vm/compiler/assembler/assembler_arm.h b/runtime/vm/compiler/assembler/assembler_arm.h index 254561957bf..b5c8ab54177 100644 --- a/runtime/vm/compiler/assembler/assembler_arm.h +++ b/runtime/vm/compiler/assembler/assembler_arm.h @@ -893,9 +893,7 @@ class Assembler : public AssemblerBase { ASSERT((shift >= 0) && (shift < kBitsPerInt32)); Lsl(rd, rn, Operand(shift)); } - void LslImmediate(Register rd, int32_t shift) { - LslImmediate(rd, rd, shift); - } + void LslImmediate(Register rd, int32_t shift) { LslImmediate(rd, rd, shift); } void LslRegister(Register dst, Register shift) override { Lsl(dst, dst, shift); } diff --git a/runtime/vm/compiler/assembler/assembler_arm64.h b/runtime/vm/compiler/assembler/assembler_arm64.h index cd4ade68a98..6950563fd9c 100644 --- a/runtime/vm/compiler/assembler/assembler_arm64.h +++ b/runtime/vm/compiler/assembler/assembler_arm64.h @@ -1528,9 +1528,7 @@ class Assembler : public AssemblerBase { } } void vmov(VRegister vd, VRegister vn) { vorr(vd, vn, vn); } - void mvn_(Register rd, Register rm) { - orn(rd, ZR, Operand(rm)); - } + void mvn_(Register rd, Register rm) { orn(rd, ZR, Operand(rm)); } void mvnw(Register rd, Register rm) { ornw(rd, ZR, Operand(rm)); } void neg(Register rd, Register rm) { sub(rd, ZR, Operand(rm)); } void negs(Register rd, Register rm, OperandSize sz = kEightBytes) { @@ -1755,9 +1753,7 @@ class Assembler : public AssemblerBase { void Call(const Code& code) { BranchLink(code); } // Clobbers LR. - void CallCFunction(Address target) { - Call(target); - } + void CallCFunction(Address target) { Call(target); } void CallCFunction(Register target) { #define __ this-> CLOBBERS_LR({ blr(target); }); @@ -1838,9 +1834,7 @@ class Assembler : public AssemblerBase { Register rn, int64_t imm, OperandSize sz = kEightBytes); - void OrImmediate(Register rd, int64_t imm) { - OrImmediate(rd, rd, imm); - } + void OrImmediate(Register rd, int64_t imm) { OrImmediate(rd, rd, imm); } void XorImmediate(Register rd, Register rn, int64_t imm, @@ -2023,9 +2017,7 @@ class Assembler : public AssemblerBase { LoadImmediate(TMP, immediate); Push(TMP); } - void PushImmediate(Immediate immediate) { - PushImmediate(immediate.value()); - } + void PushImmediate(Immediate immediate) { PushImmediate(immediate.value()); } void CompareObject(Register reg, const Object& object); void ExtractClassIdFromTags(Register result, Register tags); diff --git a/runtime/vm/compiler/assembler/assembler_arm_test.cc b/runtime/vm/compiler/assembler/assembler_arm_test.cc index 8ec2f45de47..7a9dc4189d0 100644 --- a/runtime/vm/compiler/assembler/assembler_arm_test.cc +++ b/runtime/vm/compiler/assembler/assembler_arm_test.cc @@ -143,7 +143,10 @@ ASSEMBLER_TEST_RUN(LoadHalfWordUnaligned, test) { EXPECT(test != nullptr); typedef intptr_t (*LoadHalfWordUnaligned)(intptr_t) DART_UNUSED; uint8_t buffer[4] = { - 0x89, 0xAB, 0xCD, 0xEF, + 0x89, + 0xAB, + 0xCD, + 0xEF, }; EXPECT_EQ( @@ -166,7 +169,10 @@ ASSEMBLER_TEST_RUN(LoadHalfWordUnsignedUnaligned, test) { EXPECT(test != nullptr); typedef intptr_t (*LoadHalfWordUnsignedUnaligned)(intptr_t) DART_UNUSED; uint8_t buffer[4] = { - 0x89, 0xAB, 0xCD, 0xEF, + 0x89, + 0xAB, + 0xCD, + 0xEF, }; EXPECT_EQ(0xAB89, EXECUTE_TEST_CODE_INTPTR_INTPTR( @@ -188,7 +194,10 @@ ASSEMBLER_TEST_RUN(StoreHalfWordUnaligned, test) { EXPECT(test != nullptr); typedef intptr_t (*StoreHalfWordUnaligned)(intptr_t) DART_UNUSED; uint8_t buffer[4] = { - 0, 0, 0, 0, + 0, + 0, + 0, + 0, }; EXPECT_EQ(0x1111ABCD, EXECUTE_TEST_CODE_INTPTR_INTPTR( @@ -343,25 +352,25 @@ ASSEMBLER_TEST_RUN(SingleVShiftLoadStore, test) { } ASSEMBLER_TEST_GENERATE(DoubleVLoadStore, assembler) { - int64_t value = bit_cast(12.3); - __ LoadImmediate(R0, Utils::Low32Bits(value)); - __ LoadImmediate(R1, Utils::High32Bits(value)); - __ mov(R2, Operand(SP)); - __ str(R0, Address(SP, (-target::kWordSize * 30), Address::PreIndex)); - __ str(R1, Address(R2, (-target::kWordSize * 29))); - __ vldrd(D0, Address(R2, (-target::kWordSize * 30))); - __ vaddd(D0, D0, D0); - __ vstrd(D0, Address(R2, (-target::kWordSize * 30))); - __ ldr(R1, Address(R2, (-target::kWordSize * 29))); - __ ldr(R0, Address(SP, (target::kWordSize * 30), Address::PostIndex)); - __ Ret(); + int64_t value = bit_cast(12.3); + __ LoadImmediate(R0, Utils::Low32Bits(value)); + __ LoadImmediate(R1, Utils::High32Bits(value)); + __ mov(R2, Operand(SP)); + __ str(R0, Address(SP, (-target::kWordSize * 30), Address::PreIndex)); + __ str(R1, Address(R2, (-target::kWordSize * 29))); + __ vldrd(D0, Address(R2, (-target::kWordSize * 30))); + __ vaddd(D0, D0, D0); + __ vstrd(D0, Address(R2, (-target::kWordSize * 30))); + __ ldr(R1, Address(R2, (-target::kWordSize * 29))); + __ ldr(R0, Address(SP, (target::kWordSize * 30), Address::PostIndex)); + __ Ret(); } ASSEMBLER_TEST_RUN(DoubleVLoadStore, test) { - EXPECT(test != nullptr); - typedef double (*DoubleVLoadStore)() DART_UNUSED; - float res = EXECUTE_TEST_CODE_DOUBLE(DoubleVLoadStore, test->entry()); - EXPECT_FLOAT_EQ(2 * 12.3f, res, 0.001f); + EXPECT(test != nullptr); + typedef double (*DoubleVLoadStore)() DART_UNUSED; + float res = EXECUTE_TEST_CODE_DOUBLE(DoubleVLoadStore, test->entry()); + EXPECT_FLOAT_EQ(2 * 12.3f, res, 0.001f); } ASSEMBLER_TEST_GENERATE(SingleFPOperations, assembler) { @@ -405,20 +414,20 @@ ASSEMBLER_TEST_RUN(DoubleFPOperations, test) { } ASSEMBLER_TEST_GENERATE(DoubleSqrtNeg, assembler) { - // Check that sqrt of a negative double gives NaN. - __ LoadDImmediate(D1, -1.0, R0); - __ vsqrtd(D0, D1); - __ vcmpd(D0, D0); - __ vmstat(); - __ mov(R0, Operand(1), VS); - __ mov(R0, Operand(0), VC); - __ Ret(); + // Check that sqrt of a negative double gives NaN. + __ LoadDImmediate(D1, -1.0, R0); + __ vsqrtd(D0, D1); + __ vcmpd(D0, D0); + __ vmstat(); + __ mov(R0, Operand(1), VS); + __ mov(R0, Operand(0), VC); + __ Ret(); } ASSEMBLER_TEST_RUN(DoubleSqrtNeg, test) { - EXPECT(test != nullptr); - typedef int (*DoubleSqrtNeg)() DART_UNUSED; - EXPECT_EQ(1, EXECUTE_TEST_CODE_INT32(DoubleSqrtNeg, test->entry())); + EXPECT(test != nullptr); + typedef int (*DoubleSqrtNeg)() DART_UNUSED; + EXPECT_EQ(1, EXECUTE_TEST_CODE_INT32(DoubleSqrtNeg, test->entry())); } ASSEMBLER_TEST_GENERATE(IntToDoubleConversion, assembler) { @@ -534,67 +543,67 @@ ASSEMBLER_TEST_RUN(DoubleToFloatConversion, test) { } ASSEMBLER_TEST_GENERATE(FloatCompare, assembler) { - // Test 12.3f vs 12.5f. - __ LoadSImmediate(S0, 12.3f); - __ LoadSImmediate(S1, 12.5f); + // Test 12.3f vs 12.5f. + __ LoadSImmediate(S0, 12.3f); + __ LoadSImmediate(S1, 12.5f); - // Count errors in R0. R0 is zero if no errors found. - __ mov(R0, Operand(0)); - __ vcmps(S0, S1); - __ vmstat(); - __ add(R0, R0, Operand(1), VS); // Error if unordered (Nan). - __ add(R0, R0, Operand(2), GT); // Error if greater. - __ add(R0, R0, Operand(4), EQ); // Error if equal. - __ add(R0, R0, Operand(8), PL); // Error if not less. + // Count errors in R0. R0 is zero if no errors found. + __ mov(R0, Operand(0)); + __ vcmps(S0, S1); + __ vmstat(); + __ add(R0, R0, Operand(1), VS); // Error if unordered (Nan). + __ add(R0, R0, Operand(2), GT); // Error if greater. + __ add(R0, R0, Operand(4), EQ); // Error if equal. + __ add(R0, R0, Operand(8), PL); // Error if not less. - // Test NaN. - // Create NaN by dividing 0.0f/0.0f. - __ LoadSImmediate(S1, 0.0f); - __ vdivs(S1, S1, S1); - __ vcmps(S1, S1); - __ vmstat(); - // Error if not unordered (not Nan). - __ add(R0, R0, Operand(16), VC); - // R0 is 0 if all tests passed. - __ Ret(); + // Test NaN. + // Create NaN by dividing 0.0f/0.0f. + __ LoadSImmediate(S1, 0.0f); + __ vdivs(S1, S1, S1); + __ vcmps(S1, S1); + __ vmstat(); + // Error if not unordered (not Nan). + __ add(R0, R0, Operand(16), VC); + // R0 is 0 if all tests passed. + __ Ret(); } ASSEMBLER_TEST_RUN(FloatCompare, test) { - EXPECT(test != nullptr); - typedef int (*FloatCompare)() DART_UNUSED; - EXPECT_EQ(0, EXECUTE_TEST_CODE_INT32(FloatCompare, test->entry())); + EXPECT(test != nullptr); + typedef int (*FloatCompare)() DART_UNUSED; + EXPECT_EQ(0, EXECUTE_TEST_CODE_INT32(FloatCompare, test->entry())); } ASSEMBLER_TEST_GENERATE(DoubleCompare, assembler) { - // Test 12.3 vs 12.5. - __ LoadDImmediate(D0, 12.3, R1); - __ LoadDImmediate(D1, 12.5, R1); + // Test 12.3 vs 12.5. + __ LoadDImmediate(D0, 12.3, R1); + __ LoadDImmediate(D1, 12.5, R1); - // Count errors in R0. R0 is zero if no errors found. - __ mov(R0, Operand(0)); - __ vcmpd(D0, D1); - __ vmstat(); - __ add(R0, R0, Operand(1), VS); // Error if unordered (Nan). - __ add(R0, R0, Operand(2), GT); // Error if greater. - __ add(R0, R0, Operand(4), EQ); // Error if equal. - __ add(R0, R0, Operand(8), PL); // Error if not less. + // Count errors in R0. R0 is zero if no errors found. + __ mov(R0, Operand(0)); + __ vcmpd(D0, D1); + __ vmstat(); + __ add(R0, R0, Operand(1), VS); // Error if unordered (Nan). + __ add(R0, R0, Operand(2), GT); // Error if greater. + __ add(R0, R0, Operand(4), EQ); // Error if equal. + __ add(R0, R0, Operand(8), PL); // Error if not less. - // Test NaN. - // Create NaN by dividing 0.0/0.0. - __ LoadDImmediate(D1, 0.0, R1); - __ vdivd(D1, D1, D1); - __ vcmpd(D1, D1); - __ vmstat(); - // Error if not unordered (not Nan). - __ add(R0, R0, Operand(16), VC); - // R0 is 0 if all tests passed. - __ Ret(); + // Test NaN. + // Create NaN by dividing 0.0/0.0. + __ LoadDImmediate(D1, 0.0, R1); + __ vdivd(D1, D1, D1); + __ vcmpd(D1, D1); + __ vmstat(); + // Error if not unordered (not Nan). + __ add(R0, R0, Operand(16), VC); + // R0 is 0 if all tests passed. + __ Ret(); } ASSEMBLER_TEST_RUN(DoubleCompare, test) { - EXPECT(test != nullptr); - typedef int (*DoubleCompare)() DART_UNUSED; - EXPECT_EQ(0, EXECUTE_TEST_CODE_INT32(DoubleCompare, test->entry())); + EXPECT(test != nullptr); + typedef int (*DoubleCompare)() DART_UNUSED; + EXPECT_EQ(0, EXECUTE_TEST_CODE_INT32(DoubleCompare, test->entry())); } ASSEMBLER_TEST_GENERATE(Loop, assembler) { @@ -1259,14 +1268,14 @@ ASSEMBLER_TEST_GENERATE(Ldm_stm_da, assembler) { __ Push(R9); __ Push(R0); // Make room, so we can decrement after. __ stm(DA_W, SP, (1 << R0 | 1 << R1 | 1 << R2 | 1 << R3)); - __ str(R2, Address(SP)); // Should be a free slot. + __ str(R2, Address(SP)); // Should be a free slot. __ ldr(R9, Address(SP, 1 * target::kWordSize)); // R0. R9 = +1. __ ldr(IP, Address(SP, 2 * target::kWordSize)); // R1. - __ sub(R9, R9, Operand(IP)); // -R1. R9 = -6. + __ sub(R9, R9, Operand(IP)); // -R1. R9 = -6. __ ldr(IP, Address(SP, 3 * target::kWordSize)); // R2. - __ add(R9, R9, Operand(IP)); // +R2. R9 = +5. + __ add(R9, R9, Operand(IP)); // +R2. R9 = +5. __ ldr(IP, Address(SP, 4 * target::kWordSize)); // R3. - __ sub(R9, R9, Operand(IP)); // -R3. R9 = -26. + __ sub(R9, R9, Operand(IP)); // -R3. R9 = -26. __ ldm(IB_W, SP, (1 << R0 | 1 << R1 | 1 << R2 | 1 << R3)); // Same operations again. But this time from the restore registers. __ add(R9, R9, Operand(R0)); @@ -1892,12 +1901,12 @@ ASSEMBLER_TEST_RUN(IntDiv_supported, test) { ASSEMBLER_TEST_GENERATE(IntDiv_unsupported, assembler) { #if defined(USING_SIMULATOR) - bool orig = TargetCPUFeatures::integer_division_supported(); - HostCPUFeatures::set_integer_division_supported(false); - __ mov(R0, Operand(27)); - __ mov(R1, Operand(9)); - __ IntegerDivide(R0, R0, R1, D0, D1); - HostCPUFeatures::set_integer_division_supported(orig); + bool orig = TargetCPUFeatures::integer_division_supported(); + HostCPUFeatures::set_integer_division_supported(false); + __ mov(R0, Operand(27)); + __ mov(R1, Operand(9)); + __ IntegerDivide(R0, R0, R1, D0, D1); + HostCPUFeatures::set_integer_division_supported(orig); __ Ret(); #else __ mov(R0, Operand(27)); diff --git a/runtime/vm/compiler/assembler/assembler_ia32.h b/runtime/vm/compiler/assembler/assembler_ia32.h index 3006d52f2e1..0e082beda9f 100644 --- a/runtime/vm/compiler/assembler/assembler_ia32.h +++ b/runtime/vm/compiler/assembler/assembler_ia32.h @@ -469,7 +469,7 @@ class Assembler : public AssemblerBase { void testb(const Address& address, const Immediate& imm); void testb(const Address& address, ByteRegister reg); -// clang-format off + // clang-format off // Macro for handling common ALU instructions. Arguments to F: // name, opcode, reversed opcode, opcode for the reg field of the modrm byte. #define ALU_OPS(F) \ @@ -585,9 +585,7 @@ class Assembler : public AssemblerBase { // Sets the return address to [value] as if there was a call. // On IA32 pushes [value]. - void SetReturnAddress(Register value) { - PushRegister(value); - } + void SetReturnAddress(Register value) { PushRegister(value); } void PushValueAtOffset(Register base, int32_t offset) { pushl(Address(base, offset)); @@ -718,9 +716,7 @@ class Assembler : public AssemblerBase { AddImmediate(reg, Immediate(value)); } void AddImmediate(Register dest, Register src, int32_t value); - void AddRegisters(Register dest, Register src) { - addl(dest, src); - } + void AddRegisters(Register dest, Register src) { addl(dest, src); } // [dest] = [src] << [scale] + [value]. void AddScaled(Register dest, Register src, @@ -752,9 +748,7 @@ class Assembler : public AssemblerBase { void AndRegisters(Register dst, Register src1, Register src2 = kNoRegister) override; - void OrImmediate(Register dst, int32_t value) { - orl(dst, Immediate(value)); - } + void OrImmediate(Register dst, int32_t value) { orl(dst, Immediate(value)); } void LslImmediate(Register dst, int32_t shift) { shll(dst, Immediate(shift)); } @@ -899,9 +893,7 @@ class Assembler : public AssemblerBase { void CallCFunction(Address target) { Call(target); } - void CallCFunction(Register target) { - call(target); - } + void CallCFunction(Register target) { call(target); } void Jmp(const Code& code); void J(Condition condition, const Code& code); @@ -1036,9 +1028,7 @@ class Assembler : public AssemblerBase { jmp(label, distance); } // Unconditional jump to a given address in register. - void Jump(Register target) { - jmp(target); - } + void Jump(Register target) { jmp(target); } // Moves one word from the memory at [from] to the memory at [to]. // Needs a temporary register. diff --git a/runtime/vm/compiler/assembler/assembler_riscv.h b/runtime/vm/compiler/assembler/assembler_riscv.h index ad9d177619e..2d4afef3b28 100644 --- a/runtime/vm/compiler/assembler/assembler_riscv.h +++ b/runtime/vm/compiler/assembler/assembler_riscv.h @@ -1017,9 +1017,7 @@ class Assembler : public MicroAssembler { void Call(const Code& code) { JumpAndLink(code); } void CallCFunction(Address target) { Call(target); } - void CallCFunction(Register target) { - Call(target); - } + void CallCFunction(Register target) { Call(target); } void AddImmediate(Register dest, intx_t imm) { AddImmediate(dest, dest, imm); @@ -1043,9 +1041,7 @@ class Assembler : public MicroAssembler { } } void AddShifted(Register dest, Register base, Register index, intx_t shift); - void SubRegisters(Register dest, Register src) { - sub(dest, dest, src); - } + void SubRegisters(Register dest, Register src) { sub(dest, dest, src); } // Macros accepting a pp Register argument may attempt to load values from // the object pool when possible. Unless you are sure that the untagged object @@ -1080,16 +1076,12 @@ class Assembler : public MicroAssembler { Register rn, intx_t imm, OperandSize sz = kWordBytes); - void OrImmediate(Register rd, intx_t imm) { - OrImmediate(rd, rd, imm); - } + void OrImmediate(Register rd, intx_t imm) { OrImmediate(rd, rd, imm); } void XorImmediate(Register rd, Register rn, intx_t imm, OperandSize sz = kWordBytes); - void LslImmediate(Register rd, int32_t shift) { - slli(rd, rd, shift); - } + void LslImmediate(Register rd, int32_t shift) { slli(rd, rd, shift); } void LslRegister(Register dst, Register shift) override { sll(dst, dst, shift); } @@ -1148,9 +1140,7 @@ class Assembler : public MicroAssembler { void StoreUnboxedDouble(FpuRegister src, Register base, int32_t offset) { StoreDToOffset(src, base, offset); } - void MoveUnboxedDouble(FpuRegister dst, FpuRegister src) { - fmvd(dst, src); - } + void MoveUnboxedDouble(FpuRegister dst, FpuRegister src) { fmvd(dst, src); } void LoadUnboxedSimd128(FpuRegister dst, Register base, int32_t offset) { // No single register SIMD on RISC-V. @@ -1280,9 +1270,7 @@ class Assembler : public MicroAssembler { // Sets the return address to [value] as if there was a call. // On RISC-V sets RA. - void SetReturnAddress(Register value) { - mv(RA, value); - } + void SetReturnAddress(Register value) { mv(RA, value); } // Emit code to transition between generated mode and native mode. // diff --git a/runtime/vm/compiler/assembler/assembler_x64.cc b/runtime/vm/compiler/assembler/assembler_x64.cc index 0409711a7db..8f0f7145848 100644 --- a/runtime/vm/compiler/assembler/assembler_x64.cc +++ b/runtime/vm/compiler/assembler/assembler_x64.cc @@ -2023,7 +2023,6 @@ LeafRuntimeScope::~LeafRuntimeScope() { __ LeaveFrame(); } - #if defined(TARGET_USES_THREAD_SANITIZER) void Assembler::TsanLoadAcquire(Address addr) { LeafRuntimeScope rt(this, /*frame_size=*/0, /*preserve_registers=*/true); diff --git a/runtime/vm/compiler/assembler/assembler_x64.h b/runtime/vm/compiler/assembler/assembler_x64.h index 39c372c0d64..80f98d1a5cc 100644 --- a/runtime/vm/compiler/assembler/assembler_x64.h +++ b/runtime/vm/compiler/assembler/assembler_x64.h @@ -730,9 +730,7 @@ class Assembler : public AssemblerBase { // Sets the return address to [value] as if there was a call. // On X64 pushes [value]. - void SetReturnAddress(Register value) { - PushRegister(value); - } + void SetReturnAddress(Register value) { PushRegister(value); } void CompareRegisters(Register a, Register b); void CompareObjectRegisters(Register a, Register b) { OBJ(cmp)(a, b); } @@ -784,9 +782,7 @@ class Assembler : public AssemblerBase { OperandSize width = kEightBytes) { AddImmediate(reg, Immediate(value), width); } - void AddRegisters(Register dest, Register src) { - addq(dest, src); - } + void AddRegisters(Register dest, Register src) { addq(dest, src); } // [dest] = [src] << [scale] + [value]. void AddScaled(Register dest, Register src, @@ -800,9 +796,7 @@ class Assembler : public AssemblerBase { const Immediate& imm, OperandSize width = kEightBytes); void SubImmediate(const Address& address, const Immediate& imm); - void SubRegisters(Register dest, Register src) { - subq(dest, src); - } + void SubRegisters(Register dest, Register src) { subq(dest, src); } void Drop(intptr_t stack_elements, Register tmp = TMP); @@ -1037,9 +1031,7 @@ class Assembler : public AssemblerBase { jmp(label, distance); } // Unconditional jump to a given address in register. - void Jump(Register target) { - jmp(target); - } + void Jump(Register target) { jmp(target); } // Unconditional jump to a given address in memory. void Jump(const Address& address) { jmp(address); } diff --git a/runtime/vm/compiler/assembler/assembler_x64_test.cc b/runtime/vm/compiler/assembler/assembler_x64_test.cc index 2b8e1367181..8eccbd17596 100644 --- a/runtime/vm/compiler/assembler/assembler_x64_test.cc +++ b/runtime/vm/compiler/assembler/assembler_x64_test.cc @@ -5586,9 +5586,9 @@ ASSEMBLER_TEST_RUN(TestSetCC4, test) { ASSEMBLER_TEST_GENERATE(TestRepMovsBytes, assembler) { __ pushq(RSI); __ pushq(RDI); - __ pushq(CallingConventions::kArg1Reg); // from. - __ pushq(CallingConventions::kArg2Reg); // to. - __ pushq(CallingConventions::kArg3Reg); // count. + __ pushq(CallingConventions::kArg1Reg); // from. + __ pushq(CallingConventions::kArg2Reg); // to. + __ pushq(CallingConventions::kArg3Reg); // count. __ movq(RSI, Address(RSP, 2 * target::kWordSize)); // from. __ movq(RDI, Address(RSP, 1 * target::kWordSize)); // to. __ movq(RCX, Address(RSP, 0 * target::kWordSize)); // count. diff --git a/runtime/vm/compiler/assembler/disassembler_arm.cc b/runtime/vm/compiler/assembler/disassembler_arm.cc index 7fbdac869ec..1bdabf7ee57 100644 --- a/runtime/vm/compiler/assembler/disassembler_arm.cc +++ b/runtime/vm/compiler/assembler/disassembler_arm.cc @@ -1060,13 +1060,13 @@ void ARMDecoder::DecodeType6(Instr* instr) { } } } else if (instr->IsVFPMultipleLoadStore()) { - if (instr->HasL()) { // vldm + if (instr->HasL()) { // vldm if (instr->Bit(8) != 0) { // vldmd Format(instr, "vldmd'cond'pu 'rn'w, 'dlist"); } else { // vldms Format(instr, "vldms'cond'pu 'rn'w, 'slist"); } - } else { // vstm + } else { // vstm if (instr->Bit(8) != 0) { // vstmd Format(instr, "vstmd'cond'pu 'rn'w, 'dlist"); } else { // vstms diff --git a/runtime/vm/compiler/assembler/disassembler_arm64.cc b/runtime/vm/compiler/assembler/disassembler_arm64.cc index 4140b237131..c01eb61d61c 100644 --- a/runtime/vm/compiler/assembler/disassembler_arm64.cc +++ b/runtime/vm/compiler/assembler/disassembler_arm64.cc @@ -247,7 +247,9 @@ void ARM64Decoder::PrintMemOperand(Instr* instr) { Print("]!"); break; } - default: { Print("???"); } + default: { + Print("???"); + } } } } diff --git a/runtime/vm/compiler/backend/flow_graph_compiler.cc b/runtime/vm/compiler/backend/flow_graph_compiler.cc index ef0c8c7ee3f..e4b62b1d94a 100644 --- a/runtime/vm/compiler/backend/flow_graph_compiler.cc +++ b/runtime/vm/compiler/backend/flow_graph_compiler.cc @@ -1830,7 +1830,6 @@ void FlowGraphCompiler::AllocateRegistersLocally(Instruction* instr) { } } - const ICData* FlowGraphCompiler::GetOrAddInstanceCallICData( intptr_t deopt_id, const String& target_name, diff --git a/runtime/vm/compiler/backend/il.h b/runtime/vm/compiler/backend/il.h index 3559c308430..56896878d1f 100644 --- a/runtime/vm/compiler/backend/il.h +++ b/runtime/vm/compiler/backend/il.h @@ -570,13 +570,21 @@ FOR_EACH_ABSTRACT_INSTRUCTION(FORWARD_DECLARATION) #undef FORWARD_DECLARATION #define DEFINE_INSTRUCTION_TYPE_CHECK(type) \ - virtual type##Instr* As##type() { return this; } \ - virtual const type##Instr* As##type() const { return this; } \ - virtual const char* DebugName() const { return #type; } + virtual type##Instr* As##type() { \ + return this; \ + } \ + virtual const type##Instr* As##type() const { \ + return this; \ + } \ + virtual const char* DebugName() const { \ + return #type; \ + } // Functions required in all concrete instruction classes. #define DECLARE_INSTRUCTION_NO_BACKEND(type) \ - virtual Tag tag() const { return k##type; } \ + virtual Tag tag() const { \ + return k##type; \ + } \ virtual void Accept(InstructionVisitor* visitor); \ DEFINE_INSTRUCTION_TYPE_CHECK(type) @@ -5853,7 +5861,7 @@ class DropTempsInstr : public Definition { class MakeTempInstr : public TemplateDefinition<0, NoThrow, Pure> { public: explicit MakeTempInstr(Zone* zone) - : null_(new (zone) ConstantInstr(Object::ZoneHandle())) { + : null_(new(zone) ConstantInstr(Object::ZoneHandle())) { // Note: We put ConstantInstr inside MakeTemp to simplify code generation: // having ConstantInstr allows us to use Location::Constant(null_) as an // output location for this instruction. diff --git a/runtime/vm/compiler/backend/linearscan.cc b/runtime/vm/compiler/backend/linearscan.cc index c1cc4e510d8..5da11b20c2e 100644 --- a/runtime/vm/compiler/backend/linearscan.cc +++ b/runtime/vm/compiler/backend/linearscan.cc @@ -3226,7 +3226,6 @@ void FlowGraphAllocator::CollectRepresentations() { } } - void FlowGraphAllocator::RemoveFrameIfNotNeeded() { // Intrinsic functions are naturally frameless. if (intrinsic_mode_) { diff --git a/runtime/vm/compiler/backend/range_analysis.h b/runtime/vm/compiler/backend/range_analysis.h index f51e89b70c0..653a9c161e5 100644 --- a/runtime/vm/compiler/backend/range_analysis.h +++ b/runtime/vm/compiler/backend/range_analysis.h @@ -319,13 +319,9 @@ class Range : public ZoneAllocated { const RangeBoundary& min() const { return min_; } const RangeBoundary& max() const { return max_; } - void set_min(const RangeBoundary& value) { - min_ = value; - } + void set_min(const RangeBoundary& value) { min_ = value; } - void set_max(const RangeBoundary& value) { - max_ = value; - } + void set_max(const RangeBoundary& value) { max_ = value; } static RangeBoundary ConstantMinSmi(const Range* range) { return ConstantMin(range, RangeBoundary::kRangeBoundarySmi); diff --git a/runtime/vm/compiler/backend/slot.h b/runtime/vm/compiler/backend/slot.h index dba67446739..89a57352055 100644 --- a/runtime/vm/compiler/backend/slot.h +++ b/runtime/vm/compiler/backend/slot.h @@ -505,9 +505,7 @@ class Slot : public ZoneAllocated { bool IsTypeArguments() const { return kind() == Kind::kTypeArguments; } bool IsArgumentOfType() const { return kind() == Kind::kTypeArgumentsIndex; } bool IsArrayElement() const { return kind() == Kind::kArrayElement; } - bool IsRecordField() const { - return kind() == Kind::kRecordField; - } + bool IsRecordField() const { return kind() == Kind::kRecordField; } bool IsImmutableLengthSlot() const; const char* Name() const; diff --git a/runtime/vm/compiler/compiler_pass.cc b/runtime/vm/compiler/compiler_pass.cc index 3d2cfa8c175..0593f4f8642 100644 --- a/runtime/vm/compiler/compiler_pass.cc +++ b/runtime/vm/compiler/compiler_pass.cc @@ -30,7 +30,9 @@ public: \ CompilerPass_##Name() : CompilerPass(k##Name, #Name) {} \ \ - static bool Register() { return true; } \ + static bool Register() { \ + return true; \ + } \ \ protected: \ virtual bool DoBody(CompilerPassState* state) const { \ @@ -534,9 +536,7 @@ COMPILER_PASS(AllocateRegistersForGraphIntrinsic, { allocator.AllocateRegisters(); }); -COMPILER_PASS(ReorderBlocks, { - BlockScheduler::ReorderBlocks(flow_graph); -}); +COMPILER_PASS(ReorderBlocks, { BlockScheduler::ReorderBlocks(flow_graph); }); COMPILER_PASS(EliminateWriteBarriers, { EliminateWriteBarriers(flow_graph); }); diff --git a/runtime/vm/compiler/compiler_timings.h b/runtime/vm/compiler/compiler_timings.h index 2f63f787594..26565b33392 100644 --- a/runtime/vm/compiler/compiler_timings.h +++ b/runtime/vm/compiler/compiler_timings.h @@ -156,7 +156,7 @@ class CompilerTimings : public MallocAllocated { #define PRECOMPILER_TIMER_SCOPE(precompiler, timer_id) \ CompilerTimings::Scope TIMER_SCOPE_NAME(__COUNTER__)( \ - (precompiler)->thread(), CompilerTimings::k##timer_id) + (precompiler) -> thread(), CompilerTimings::k##timer_id) } // namespace dart diff --git a/runtime/vm/compiler/ffi/recognized_method.cc b/runtime/vm/compiler/ffi/recognized_method.cc index a0a65949ae4..32ca9921ea5 100644 --- a/runtime/vm/compiler/ffi/recognized_method.cc +++ b/runtime/vm/compiler/ffi/recognized_method.cc @@ -89,7 +89,7 @@ classid_t RecognizedMethodTypeArgCid(MethodRecognizer::Kind kind) { #define AS_EXTERNAL_TYPED_DATA(type) \ case MethodRecognizer::kFfiAsExternalTypedData##type: \ return kFfi##type##Cid; - CLASS_LIST_FFI_NUMERIC_FIXED_SIZE(AS_EXTERNAL_TYPED_DATA) + CLASS_LIST_FFI_NUMERIC_FIXED_SIZE(AS_EXTERNAL_TYPED_DATA) #undef AS_EXTERNAL_TYPED_DATA default: UNREACHABLE(); diff --git a/runtime/vm/compiler/frontend/base_flow_graph_builder.cc b/runtime/vm/compiler/frontend/base_flow_graph_builder.cc index 53fbbdfdff4..1fb6ad84d0c 100644 --- a/runtime/vm/compiler/frontend/base_flow_graph_builder.cc +++ b/runtime/vm/compiler/frontend/base_flow_graph_builder.cc @@ -6,7 +6,7 @@ #include -#include "vm/compiler/backend/range_analysis.h" // For Range. +#include "vm/compiler/backend/range_analysis.h" // For Range. #include "vm/compiler/frontend/flow_graph_builder.h" // For InlineExitCollector. #include "vm/compiler/frontend/kernel_translation_helper.h" #include "vm/compiler/jit/compiler.h" // For Compiler::IsBackgroundCompilation(). diff --git a/runtime/vm/compiler/frontend/constant_reader.cc b/runtime/vm/compiler/frontend/constant_reader.cc index ad8f0b6ae63..3f733af864e 100644 --- a/runtime/vm/compiler/frontend/constant_reader.cc +++ b/runtime/vm/compiler/frontend/constant_reader.cc @@ -320,9 +320,9 @@ InstancePtr ConstantReader::ReadConstantInternal(intptr_t constant_index) { ASSERT(!list_class.IsNull()); ASSERT(list_class.is_finalized()); // Build type from the raw bytes (needs temporary translator). - TypeTranslator type_translator( - &reader, this, active_class_, /* finalize = */ true, - /* in_constant_context = */ true); + TypeTranslator type_translator(&reader, this, active_class_, + /* finalize = */ true, + /* in_constant_context = */ true); auto& type_arguments = TypeArguments::Handle(Z, TypeArguments::New(1, Heap::kOld)); AbstractType& type = type_translator.BuildType(); @@ -354,9 +354,9 @@ InstancePtr ConstantReader::ReadConstantInternal(intptr_t constant_index) { ASSERT(map_class.is_finalized()); // Build types from the raw bytes (needs temporary translator). - TypeTranslator type_translator( - &reader, this, active_class_, /* finalize = */ true, - /* in_constant_context = */ true); + TypeTranslator type_translator(&reader, this, active_class_, + /* finalize = */ true, + /* in_constant_context = */ true); auto& type_arguments = TypeArguments::Handle(Z, TypeArguments::New(2, Heap::kOld)); AbstractType& type = type_translator.BuildType(); @@ -445,9 +445,9 @@ InstancePtr ConstantReader::ReadConstantInternal(intptr_t constant_index) { ASSERT(set_class.is_finalized()); // Build types from the raw bytes (needs temporary translator). - TypeTranslator type_translator( - &reader, this, active_class_, /* finalize = */ true, - /* in_constant_context = */ true); + TypeTranslator type_translator(&reader, this, active_class_, + /* finalize = */ true, + /* in_constant_context = */ true); auto& type_arguments = TypeArguments::Handle(Z, TypeArguments::New(1, Heap::kOld)); AbstractType& type = type_translator.BuildType(); @@ -499,9 +499,9 @@ InstancePtr ConstantReader::ReadConstantInternal(intptr_t constant_index) { ASSERT(klass.is_enum_class() || klass.is_const()); instance = Instance::New(klass, Heap::kOld); // Build type from the raw bytes (needs temporary translator). - TypeTranslator type_translator( - &reader, this, active_class_, /* finalize = */ true, - /* in_constant_context = */ true); + TypeTranslator type_translator(&reader, this, active_class_, + /* finalize = */ true, + /* in_constant_context = */ true); const intptr_t number_of_type_arguments = reader.ReadUInt(); if (klass.NumTypeArguments() > 0) { auto& type_arguments = TypeArguments::Handle( @@ -540,9 +540,9 @@ InstancePtr ConstantReader::ReadConstantInternal(intptr_t constant_index) { ASSERT(!constant.IsNull()); // Build type from the raw bytes (needs temporary translator). - TypeTranslator type_translator( - &reader, this, active_class_, /* finalize = */ true, - /* in_constant_context = */ true); + TypeTranslator type_translator(&reader, this, active_class_, + /* finalize = */ true, + /* in_constant_context = */ true); const intptr_t number_of_type_arguments = reader.ReadUInt(); ASSERT(number_of_type_arguments > 0); auto& type_arguments = TypeArguments::Handle( diff --git a/runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc b/runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc index 9380a07cffe..4a3f368e366 100644 --- a/runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc +++ b/runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc @@ -4277,7 +4277,7 @@ Fragment StreamingFlowGraphBuilder::BuildRecordFieldGet(TokenPosition* p, Fragment StreamingFlowGraphBuilder::BuildFunctionExpression() { const intptr_t offset = ReaderOffset() - 1; // Include the tag. - ReadPosition(); // read position. + ReadPosition(); // read position. return BuildFunctionNode(offset); } diff --git a/runtime/vm/compiler/frontend/kernel_fingerprints.cc b/runtime/vm/compiler/frontend/kernel_fingerprints.cc index d9276477512..c9f3b25c152 100644 --- a/runtime/vm/compiler/frontend/kernel_fingerprints.cc +++ b/runtime/vm/compiler/frontend/kernel_fingerprints.cc @@ -82,8 +82,8 @@ void KernelFingerprintHelper::CalculateConstructorFingerprint() { void KernelFingerprintHelper::CalculateArgumentsFingerprint() { BuildHash(ReadUInt()); // read argument count. - CalculateListOfDartTypesFingerprint(); // read list of types. - CalculateListOfExpressionsFingerprint(); // read positional. + CalculateListOfDartTypesFingerprint(); // read list of types. + CalculateListOfExpressionsFingerprint(); // read positional. CalculateListOfNamedExpressionsFingerprint(); // read named. } @@ -250,7 +250,7 @@ void KernelFingerprintHelper::CalculateDartTypeFingerprint() { case kTypeParameterType: { Nullability nullability = ReadNullability(); BuildHash(static_cast(nullability)); - ReadUInt(); // read index for parameter. + ReadUInt(); // read index for parameter. break; } case kIntersectionType: @@ -518,9 +518,9 @@ void KernelFingerprintHelper::CalculateExpressionFingerprint() { UNREACHABLE(); break; case kSuperMethodInvocation: - ReadPosition(); // read position. - BuildHash(ReadNameAsMethodName().Hash()); // read name. - CalculateArgumentsFingerprint(); // read arguments. + ReadPosition(); // read position. + BuildHash(ReadNameAsMethodName().Hash()); // read name. + CalculateArgumentsFingerprint(); // read arguments. CalculateInterfaceMemberNameFingerprint(); // read target_reference. return; case kStaticInvocation: diff --git a/runtime/vm/compiler/jit/compiler.h b/runtime/vm/compiler/jit/compiler.h index cefb18c8f94..8a3aae93da4 100644 --- a/runtime/vm/compiler/jit/compiler.h +++ b/runtime/vm/compiler/jit/compiler.h @@ -151,8 +151,8 @@ class BackgroundCompiler { Monitor monitor_; // Controls access to the queue and running state. BackgroundCompilationQueue* function_queue_; - bool running_; // While true, will try to read queue and compile. - bool done_; // True if the thread is done. + bool running_; // While true, will try to read queue and compile. + bool done_; // True if the thread is done. int16_t disabled_depth_; DISALLOW_IMPLICIT_CONSTRUCTORS(BackgroundCompiler); diff --git a/runtime/vm/compiler/relocation_test.cc b/runtime/vm/compiler/relocation_test.cc index 8aa5c427e4d..6ba784551ba 100644 --- a/runtime/vm/compiler/relocation_test.cc +++ b/runtime/vm/compiler/relocation_test.cc @@ -50,9 +50,7 @@ struct RelocatorTestHelper { FLAG_lower_pc_relative_call_distance = -128; FLAG_upper_pc_relative_call_distance = 128; } - ~RelocatorTestHelper() { - FLAG_precompiled_mode = false; - } + ~RelocatorTestHelper() { FLAG_precompiled_mode = false; } void CreateInstructions(std::initializer_list sizes) { for (auto size : sizes) { diff --git a/runtime/vm/compiler/runtime_api.cc b/runtime/vm/compiler/runtime_api.cc index 6050fe7cf28..e263e96efae 100644 --- a/runtime/vm/compiler/runtime_api.cc +++ b/runtime/vm/compiler/runtime_api.cc @@ -92,7 +92,9 @@ bool IsNotTemporaryScopedHandle(const Object& obj) { #endif #define DO(clazz) \ - bool Is##clazz##Handle(const Object& obj) { return obj.Is##clazz(); } + bool Is##clazz##Handle(const Object& obj) { \ + return obj.Is##clazz(); \ + } CLASS_LIST_FOR_HANDLES(DO) #undef DO @@ -634,13 +636,17 @@ const word MegamorphicCache::kSpreadFactor = #define DEFINE_CONSTANT(Class, Name) const word Class::Name = Class##_##Name; #define DEFINE_ARRAY_SIZEOF(clazz, name, ElementOffset) \ - word clazz::name() { return 0; } \ + word clazz::name() { \ + return 0; \ + } \ word clazz::name(intptr_t length) { \ return RoundedAllocationSize(clazz::ElementOffset(length)); \ } #define DEFINE_PAYLOAD_SIZEOF(clazz, name, header) \ - word clazz::name() { return 0; } \ + word clazz::name() { \ + return 0; \ + } \ word clazz::name(word payload_size) { \ return RoundedAllocationSize(clazz::header() + payload_size); \ } @@ -648,7 +654,9 @@ const word MegamorphicCache::kSpreadFactor = #if defined(TARGET_ARCH_IA32) #define DEFINE_FIELD(clazz, name) \ - word clazz::name() { return clazz##_##name; } + word clazz::name() { \ + return clazz##_##name; \ + } #define DEFINE_ARRAY(clazz, name) \ word clazz::name(intptr_t index) { \ @@ -656,7 +664,9 @@ const word MegamorphicCache::kSpreadFactor = } #define DEFINE_SIZEOF(clazz, name, what) \ - word clazz::name() { return clazz##_##name; } + word clazz::name() { \ + return clazz##_##name; \ + } #define DEFINE_RANGE(Class, Getter, Type, First, Last, Filter) \ word Class::Getter(Type index) { \ @@ -739,7 +749,9 @@ JIT_OFFSETS_LIST(DEFINE_JIT_FIELD, // definitions using DART_PRECOMPILER. #define DEFINE_AOT_FIELD(clazz, name) \ - word clazz::name() { return AOT_##clazz##_##name; } + word clazz::name() { \ + return AOT_##clazz##_##name; \ + } #define DEFINE_AOT_ARRAY(clazz, name) \ word clazz::name(intptr_t index) { \ @@ -748,7 +760,9 @@ JIT_OFFSETS_LIST(DEFINE_JIT_FIELD, } #define DEFINE_AOT_SIZEOF(clazz, name, what) \ - word clazz::name() { return AOT_##clazz##_##name; } + word clazz::name() { \ + return AOT_##clazz##_##name; \ + } #define DEFINE_AOT_RANGE(Class, Getter, Type, First, Last, Filter) \ word Class::Getter(Type index) { \ diff --git a/runtime/vm/compiler/runtime_api.h b/runtime/vm/compiler/runtime_api.h index c7f30e387aa..f1a70bf13f3 100644 --- a/runtime/vm/compiler/runtime_api.h +++ b/runtime/vm/compiler/runtime_api.h @@ -404,7 +404,9 @@ bool WillAllocateNewOrRememberedContext(intptr_t num_context_variables); bool WillAllocateNewOrRememberedArray(intptr_t length); #define FINAL_CLASS() \ - static word NextFieldOffset() { return -kWordSize; } + static word NextFieldOffset() { \ + return -kWordSize; \ + } // // Target specific offsets and constants. diff --git a/runtime/vm/compiler/stub_code_compiler.cc b/runtime/vm/compiler/stub_code_compiler.cc index f1de714428b..4201bca9db3 100644 --- a/runtime/vm/compiler/stub_code_compiler.cc +++ b/runtime/vm/compiler/stub_code_compiler.cc @@ -462,11 +462,11 @@ void StubCodeCompiler::GenerateInstantiateTypeArgumentsStub() { #endif __ PushRegistersInOrder({ #if defined(DART_ASSEMBLER_HAS_NULL_REG) - NULL_REG, + NULL_REG, #endif - InstantiationABI::kUninstantiatedTypeArgumentsReg, - InstantiationABI::kInstantiatorTypeArgumentsReg, - InstantiationABI::kFunctionTypeArgumentsReg, + InstantiationABI::kUninstantiatedTypeArgumentsReg, + InstantiationABI::kInstantiatorTypeArgumentsReg, + InstantiationABI::kFunctionTypeArgumentsReg, }); __ CallRuntime(kInstantiateTypeArgumentsRuntimeEntry, 3); __ Drop(3); // Drop 2 type vectors, and uninstantiated type. diff --git a/runtime/vm/compiler/stub_code_compiler_arm.cc b/runtime/vm/compiler/stub_code_compiler_arm.cc index f2430c6a0da..c47a3e01085 100644 --- a/runtime/vm/compiler/stub_code_compiler_arm.cc +++ b/runtime/vm/compiler/stub_code_compiler_arm.cc @@ -695,8 +695,8 @@ void StubCodeCompiler::GenerateFixCallersTargetStub() { __ Push(R0); // Preserve receiver. __ Push(R9); // Old cache value (also 2nd return value). __ CallRuntime(kFixCallersTargetMonomorphicRuntimeEntry, 2); - __ Pop(R9); // Get target cache object. - __ Pop(R0); // Restore receiver. + __ Pop(R9); // Get target cache object. + __ Pop(R0); // Restore receiver. __ Pop(CODE_REG); // Get target Code object. // Remove the stub frame. __ LeaveStubFrame(); @@ -846,25 +846,25 @@ static void GenerateDeoptimizationSequence(Assembler* assembler, } } - ASSERT(kFpuRegisterSize == 4 * target::kWordSize); - if (kNumberOfDRegisters > 16) { - __ vstmd(DB_W, SP, D16, kNumberOfDRegisters - 16); - __ vstmd(DB_W, SP, D0, 16); - } else { - __ vstmd(DB_W, SP, D0, kNumberOfDRegisters); - } + ASSERT(kFpuRegisterSize == 4 * target::kWordSize); + if (kNumberOfDRegisters > 16) { + __ vstmd(DB_W, SP, D16, kNumberOfDRegisters - 16); + __ vstmd(DB_W, SP, D0, 16); + } else { + __ vstmd(DB_W, SP, D0, kNumberOfDRegisters); + } - { - __ mov(R0, Operand(SP)); // Pass address of saved registers block. - LeafRuntimeScope rt(assembler, - /*frame_size=*/0, - /*preserve_registers=*/false); - bool is_lazy = - (kind == kLazyDeoptFromReturn) || (kind == kLazyDeoptFromThrow); - __ mov(R1, Operand(is_lazy ? 1 : 0)); - rt.Call(kDeoptimizeCopyFrameRuntimeEntry, 2); - // Result (R0) is stack-size (FP - SP) in bytes. - } + { + __ mov(R0, Operand(SP)); // Pass address of saved registers block. + LeafRuntimeScope rt(assembler, + /*frame_size=*/0, + /*preserve_registers=*/false); + bool is_lazy = + (kind == kLazyDeoptFromReturn) || (kind == kLazyDeoptFromThrow); + __ mov(R1, Operand(is_lazy ? 1 : 0)); + rt.Call(kDeoptimizeCopyFrameRuntimeEntry, 2); + // Result (R0) is stack-size (FP - SP) in bytes. + } if (kind == kLazyDeoptFromReturn) { // Restore result into R1 temporarily. @@ -1004,8 +1004,8 @@ static void GenerateNoSuchMethodDispatcherBody(Assembler* assembler) { __ ldr(R8, Address(IP, target::frame_layout.param_end_from_fp * target::kWordSize)); __ LoadImmediate(IP, 0); - __ Push(IP); // Result slot. - __ Push(R8); // Receiver. + __ Push(IP); // Result slot. + __ Push(R8); // Receiver. __ Push(IC_DATA_REG); // ICData/MegamorphicCache. __ Push(ARGS_DESC_REG); // Arguments descriptor. @@ -1087,8 +1087,8 @@ void StubCodeCompiler::GenerateAllocateArrayStub() { __ ldr(AllocateArrayABI::kResultReg, Address(THR, target::Thread::top_offset())); __ adds(R3, AllocateArrayABI::kResultReg, - Operand(R9)); // Potential next object start. - __ b(&slow_case, CS); // Branch if unsigned overflow. + Operand(R9)); // Potential next object start. + __ b(&slow_case, CS); // Branch if unsigned overflow. // Check if the allocation fits into the remaining space. // AllocateArrayABI::kResultReg: potential new object start. @@ -1592,8 +1592,7 @@ void StubCodeCompiler::GenerateWriteBarrierWrappersStub() { COMPILE_ASSERT(kWriteBarrierObjectReg == R1); COMPILE_ASSERT(kWriteBarrierValueReg == R0); COMPILE_ASSERT(kWriteBarrierSlotReg == R9); -static void GenerateWriteBarrierStubHelper(Assembler* assembler, - bool cards) { +static void GenerateWriteBarrierStubHelper(Assembler* assembler, bool cards) { Label skip_marking; __ Push(R2); __ ldr(TMP, FieldAddress(R0, target::Object::tags_offset())); @@ -1723,15 +1722,15 @@ static void GenerateWriteBarrierStubHelper(Assembler* assembler, // Dirty the card. Not atomic: we assume mutable arrays are not shared // between threads __ PushList((1 << R0) | (1 << R1)); - __ AndImmediate(TMP, R1, target::kPageMask); // Page. - __ sub(R9, R9, Operand(TMP)); // Offset in page. + __ AndImmediate(TMP, R1, target::kPageMask); // Page. + __ sub(R9, R9, Operand(TMP)); // Offset in page. __ Lsr(R9, R9, Operand(target::Page::kBytesPerCardLog2)); // Card index. __ AndImmediate(R1, R9, target::kBitsPerWord - 1); // Lsl is not mod 32. __ LoadImmediate(R0, 1); // Bit offset. __ Lsl(R0, R0, R1); // Bit mask. __ ldr(TMP, - Address(TMP, target::Page::card_table_offset())); // Card table. - __ Lsr(R9, R9, Operand(target::kBitsPerWordLog2)); // Word index. + Address(TMP, target::Page::card_table_offset())); // Card table. + __ Lsr(R9, R9, Operand(target::kBitsPerWordLog2)); // Word index. __ add(TMP, TMP, Operand(R9, LSL, target::kWordSizeLog2)); // Word address. __ ldr(R1, Address(TMP, 0)); __ orr(R1, R1, Operand(R0)); @@ -2840,7 +2839,7 @@ void StubCodeCompiler::GenerateJumpToFrameStub() { COMPILE_ASSERT(kStackTraceObjectReg == R1); COMPILE_ASSERT(IsAbiPreservedRegister(R4)); COMPILE_ASSERT(IsAbiPreservedRegister(THR)); - __ mov(IP, Operand(R1)); // Copy Stack pointer into IP. + __ mov(IP, Operand(R1)); // Copy Stack pointer into IP. // TransitionGeneratedToNative might clobber LR if it takes the slow path. __ mov(R4, Operand(R0)); // Program counter. __ mov(THR, Operand(R3)); // Thread. @@ -2941,7 +2940,7 @@ void StubCodeCompiler::GenerateOptimizeFunctionStub() { __ Push(IP); // Setup space on stack for return value. __ Push(R8); __ CallRuntime(kOptimizeInvokedFunctionRuntimeEntry, 1); - __ Pop(R0); // Discard argument. + __ Pop(R0); // Discard argument. __ Pop(FUNCTION_REG); // Get Function object __ Pop(ARGS_DESC_REG); // Restore argument descriptor. __ LeaveStubFrame(); diff --git a/runtime/vm/compiler/stub_code_compiler_arm64.cc b/runtime/vm/compiler/stub_code_compiler_arm64.cc index 3b55dcd0a8b..306f495e6cb 100644 --- a/runtime/vm/compiler/stub_code_compiler_arm64.cc +++ b/runtime/vm/compiler/stub_code_compiler_arm64.cc @@ -1254,8 +1254,8 @@ static void GenerateNoSuchMethodDispatcherBody(Assembler* assembler) { __ add(TMP, FP, Operand(R2, LSL, target::kWordSizeLog2 - 1)); // R2 is Smi. __ LoadFromOffset(R6, TMP, target::frame_layout.param_end_from_fp * target::kWordSize); - __ Push(ZR); // Result slot. - __ Push(R6); // Receiver. + __ Push(ZR); // Result slot. + __ Push(R6); // Receiver. __ Push(IC_DATA_REG); // ICData/MegamorphicCache. __ Push(ARGS_DESC_REG); // Arguments descriptor. @@ -1897,8 +1897,7 @@ void StubCodeCompiler::GenerateWriteBarrierWrappersStub() { COMPILE_ASSERT(kWriteBarrierObjectReg == R1); COMPILE_ASSERT(kWriteBarrierValueReg == R0); COMPILE_ASSERT(kWriteBarrierSlotReg == R25); -static void GenerateWriteBarrierStubHelper(Assembler* assembler, - bool cards) { +static void GenerateWriteBarrierStubHelper(Assembler* assembler, bool cards) { RegisterSet spill_set((1 << R2) | (1 << R3) | (1 << R4), 0); Label skip_marking; @@ -2402,7 +2401,7 @@ static void EmitFastSmiOp(Assembler* assembler, switch (kind) { case Token::kADD: { __ adds(R0, R1, Operand(R0), kObjectBytes); // Add. - __ b(not_smi_or_overflow, VS); // Branch if overflow. + __ b(not_smi_or_overflow, VS); // Branch if overflow. break; } case Token::kLT: { @@ -2636,7 +2635,7 @@ void StubCodeCompiler::GenerateNArgsCheckInlineCacheStub( // Preserve IC data object and arguments descriptor array and // setup space on stack for result (target code object). __ Push(ARGS_DESC_REG); // Preserve arguments descriptor array. - __ Push(R5); // Preserve IC Data. + __ Push(R5); // Preserve IC Data. if (save_entry_point) { __ SmiTag(R8); __ Push(R8); @@ -2660,7 +2659,7 @@ void StubCodeCompiler::GenerateNArgsCheckInlineCacheStub( __ Pop(R8); __ SmiUntag(R8); } - __ Pop(R5); // Restore IC Data. + __ Pop(R5); // Restore IC Data. __ Pop(ARGS_DESC_REG); // Restore arguments descriptor array. __ RestoreCodePointer(); __ LeaveStubFrame(); @@ -3238,7 +3237,7 @@ void StubCodeCompiler::GenerateOptimizeFunctionStub() { __ Push(ZR); __ Push(R6); __ CallRuntime(kOptimizeInvokedFunctionRuntimeEntry, 1); - __ Pop(R0); // Discard argument. + __ Pop(R0); // Discard argument. __ Pop(FUNCTION_REG); // Get Function object __ Pop(ARGS_DESC_REG); // Restore argument descriptor. __ LoadCompressedFieldFromOffset(CODE_REG, FUNCTION_REG, diff --git a/runtime/vm/compiler/stub_code_compiler_ia32.cc b/runtime/vm/compiler/stub_code_compiler_ia32.cc index 3c90d9d6d02..c6353a9b223 100644 --- a/runtime/vm/compiler/stub_code_compiler_ia32.cc +++ b/runtime/vm/compiler/stub_code_compiler_ia32.cc @@ -105,7 +105,7 @@ void StubCodeCompiler::GenerateCallToRuntimeStub() { } // Pass NativeArguments structure by value and call runtime. - __ movl(Address(ESP, thread_offset), THR); // Set thread in NativeArgs. + __ movl(Address(ESP, thread_offset), THR); // Set thread in NativeArgs. __ movl(Address(ESP, argc_tag_offset), EDX); // Set argc in NativeArguments. // Compute argv. __ leal(EAX, @@ -544,9 +544,9 @@ void StubCodeCompiler::GenerateCallBootstrapNativeStub() { void StubCodeCompiler::GenerateCallStaticFunctionStub() { __ EnterStubFrame(); __ pushl(ARGS_DESC_REG); // Preserve arguments descriptor array. - __ pushl(Immediate(0)); // Setup space on stack for return value. + __ pushl(Immediate(0)); // Setup space on stack for return value. __ CallRuntime(kPatchStaticCallRuntimeEntry, 0); - __ popl(EAX); // Get Code object result. + __ popl(EAX); // Get Code object result. __ popl(ARGS_DESC_REG); // Restore arguments descriptor array. // Remove the stub frame as we are about to jump to the dart function. __ LeaveFrame(); @@ -564,9 +564,9 @@ void StubCodeCompiler::GenerateFixCallersTargetStub() { // This was a static call. __ EnterStubFrame(); __ pushl(ARGS_DESC_REG); // Preserve arguments descriptor array. - __ pushl(Immediate(0)); // Setup space on stack for return value. + __ pushl(Immediate(0)); // Setup space on stack for return value. __ CallRuntime(kFixCallersTargetRuntimeEntry, 0); - __ popl(EAX); // Get Code object. + __ popl(EAX); // Get Code object. __ popl(ARGS_DESC_REG); // Restore arguments descriptor array. __ movl(EAX, FieldAddress(EAX, target::Code::entry_point_offset())); __ LeaveFrame(); @@ -1545,8 +1545,8 @@ static void GenerateWriteBarrierStubHelper(Assembler* assembler, bool cards) { // Get card table. __ Bind(&remember_card); - __ movl(EAX, EDX); // Object. - __ andl(EAX, Immediate(target::kPageMask)); // Page. + __ movl(EAX, EDX); // Object. + __ andl(EAX, Immediate(target::kPageMask)); // Page. __ cmpl(Address(EAX, target::Page::card_table_offset()), Immediate(0)); __ j(EQUAL, &remember_card_slow, Assembler::kNearJump); @@ -2065,8 +2065,8 @@ void StubCodeCompiler::GenerateNArgsCheckInlineCacheStubForEntryKind( // calling into the runtime. __ EnterStubFrame(); __ pushl(ARGS_DESC_REG); // Preserve arguments descriptor array. - __ pushl(ECX); // Preserve IC data object. - __ pushl(Immediate(0)); // Result slot. + __ pushl(ECX); // Preserve IC data object. + __ pushl(Immediate(0)); // Result slot. // Push call arguments. for (intptr_t i = 0; i < num_args; i++) { __ movl(EBX, Address(EAX, -target::kWordSize * i)); @@ -2078,8 +2078,8 @@ void StubCodeCompiler::GenerateNArgsCheckInlineCacheStubForEntryKind( for (intptr_t i = 0; i < num_args + 1; i++) { __ popl(EAX); } - __ popl(FUNCTION_REG); // Pop returned function object into EAX. - __ popl(ECX); // Restore IC data array. + __ popl(FUNCTION_REG); // Pop returned function object into EAX. + __ popl(ECX); // Restore IC data array. __ popl(ARGS_DESC_REG); // Restore arguments descriptor array. __ LeaveFrame(); Label call_target_function; @@ -2843,7 +2843,7 @@ void StubCodeCompiler::GenerateOptimizeFunctionStub() { __ pushl(Immediate(0)); // Setup space on stack for return value. __ pushl(EBX); __ CallRuntime(kOptimizeInvokedFunctionRuntimeEntry, 1); - __ popl(EAX); // Discard argument. + __ popl(EAX); // Discard argument. __ popl(FUNCTION_REG); // Get Function object __ popl(ARGS_DESC_REG); // Restore argument descriptor. __ LeaveFrame(); diff --git a/runtime/vm/compiler/stub_code_compiler_riscv.cc b/runtime/vm/compiler/stub_code_compiler_riscv.cc index 68540761b1a..8af980b1419 100644 --- a/runtime/vm/compiler/stub_code_compiler_riscv.cc +++ b/runtime/vm/compiler/stub_code_compiler_riscv.cc @@ -1709,8 +1709,7 @@ void StubCodeCompiler::GenerateWriteBarrierWrappersStub() { COMPILE_ASSERT(kWriteBarrierObjectReg == A0); COMPILE_ASSERT(kWriteBarrierValueReg == A1); COMPILE_ASSERT(kWriteBarrierSlotReg == A6); -static void GenerateWriteBarrierStubHelper(Assembler* assembler, - bool cards) { +static void GenerateWriteBarrierStubHelper(Assembler* assembler, bool cards) { RegisterSet spill_set((1 << T2) | (1 << T3) | (1 << T4), 0); Label skip_marking; diff --git a/runtime/vm/compiler/stub_code_compiler_x64.cc b/runtime/vm/compiler/stub_code_compiler_x64.cc index 434d0ae0508..f85b9d37894 100644 --- a/runtime/vm/compiler/stub_code_compiler_x64.cc +++ b/runtime/vm/compiler/stub_code_compiler_x64.cc @@ -825,7 +825,7 @@ void StubCodeCompiler::GenerateCallStaticFunctionStub() { // Setup space on stack for return value. __ pushq(Immediate(0)); __ CallRuntime(kPatchStaticCallRuntimeEntry, 0); - __ popq(CODE_REG); // Get Code object result. + __ popq(CODE_REG); // Get Code object result. __ popq(ARGS_DESC_REG); // Restore arguments descriptor array. // Remove the stub frame as we are about to jump to the dart function. __ LeaveStubFrame(); @@ -852,7 +852,7 @@ void StubCodeCompiler::GenerateFixCallersTargetStub() { // Setup space on stack for return value. __ pushq(Immediate(0)); __ CallRuntime(kFixCallersTargetRuntimeEntry, 0); - __ popq(CODE_REG); // Get Code object. + __ popq(CODE_REG); // Get Code object. __ popq(ARGS_DESC_REG); // Restore arguments descriptor array. __ movq(RAX, FieldAddress(CODE_REG, target::Code::entry_point_offset())); __ LeaveStubFrame(); @@ -1173,9 +1173,9 @@ void StubCodeCompiler::GenerateDeoptimizeStub() { // RDI - arguments descriptor size static void GenerateNoSuchMethodDispatcherBody(Assembler* assembler, Register receiver_reg) { - __ pushq(Immediate(0)); // Setup space on stack for result. - __ pushq(receiver_reg); // Receiver. - __ pushq(IC_DATA_REG); // ICData/MegamorphicCache. + __ pushq(Immediate(0)); // Setup space on stack for result. + __ pushq(receiver_reg); // Receiver. + __ pushq(IC_DATA_REG); // ICData/MegamorphicCache. __ pushq(ARGS_DESC_REG); // Arguments descriptor array. // Adjust arguments count. @@ -1947,14 +1947,13 @@ static void GenerateWriteBarrierStubHelper(Assembler* assembler, bool cards) { __ ret(); } - if (cards) { Label remember_card_slow; // Get card table. __ Bind(&remember_card); - __ movq(TMP, RDX); // Object. - __ andq(TMP, Immediate(target::kPageMask)); // Page. + __ movq(TMP, RDX); // Object. + __ andq(TMP, Immediate(target::kPageMask)); // Page. __ cmpq(Address(TMP, target::Page::card_table_offset()), Immediate(0)); __ j(EQUAL, &remember_card_slow, Assembler::kNearJump); @@ -2555,8 +2554,8 @@ void StubCodeCompiler::GenerateNArgsCheckInlineCacheStub( __ pushq(R8); // Preserve entry point. } __ pushq(ARGS_DESC_REG); // Preserve arguments descriptor array. - __ pushq(RBX); // Preserve IC data object. - __ pushq(Immediate(0)); // Result slot. + __ pushq(RBX); // Preserve IC data object. + __ pushq(Immediate(0)); // Result slot. // Push call arguments. for (intptr_t i = 0; i < num_args; i++) { __ movq(RCX, Address(RAX, -target::kWordSize * i)); @@ -2568,8 +2567,8 @@ void StubCodeCompiler::GenerateNArgsCheckInlineCacheStub( for (intptr_t i = 0; i < num_args + 1; i++) { __ popq(RAX); } - __ popq(FUNCTION_REG); // Pop returned function object into RAX. - __ popq(RBX); // Restore IC data array. + __ popq(FUNCTION_REG); // Pop returned function object into RAX. + __ popq(RBX); // Restore IC data array. __ popq(ARGS_DESC_REG); // Restore arguments descriptor array. if (save_entry_point) { __ popq(R8); // Restore entry point. @@ -3160,10 +3159,10 @@ void StubCodeCompiler::GenerateOptimizeFunctionStub() { __ movq(CODE_REG, Address(THR, target::Thread::optimize_stub_offset())); __ EnterStubFrame(); __ pushq(ARGS_DESC_REG); // Preserve args descriptor. - __ pushq(Immediate(0)); // Result slot. - __ pushq(RDI); // Arg0: function to optimize + __ pushq(Immediate(0)); // Result slot. + __ pushq(RDI); // Arg0: function to optimize __ CallRuntime(kOptimizeInvokedFunctionRuntimeEntry, 1); - __ popq(RAX); // Discard argument. + __ popq(RAX); // Discard argument. __ popq(FUNCTION_REG); // Get Function object. __ popq(ARGS_DESC_REG); // Restore argument descriptor. __ LeaveStubFrame(); diff --git a/runtime/vm/compiler/write_barrier_elimination.cc b/runtime/vm/compiler/write_barrier_elimination.cc index a680e5067e8..fadfc09e88a 100644 --- a/runtime/vm/compiler/write_barrier_elimination.cc +++ b/runtime/vm/compiler/write_barrier_elimination.cc @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +#include "vm/compiler/write_barrier_elimination.h" #include "vm/compiler/backend/flow_graph.h" #include "vm/compiler/compiler_pass.h" -#include "vm/compiler/write_barrier_elimination.h" namespace dart { diff --git a/runtime/vm/constants_riscv.h b/runtime/vm/constants_riscv.h index ab10687b616..3bb7eef015f 100644 --- a/runtime/vm/constants_riscv.h +++ b/runtime/vm/constants_riscv.h @@ -1522,7 +1522,9 @@ 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_; \ } \ @@ -1543,14 +1545,18 @@ 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/dart_api_impl.cc b/runtime/vm/dart_api_impl.cc index 82cece8f263..581b0f3fe9c 100644 --- a/runtime/vm/dart_api_impl.cc +++ b/runtime/vm/dart_api_impl.cc @@ -6067,9 +6067,9 @@ Dart_CompileToKernel(const char* script_uri, nullptr, verbosity); if (incremental_compile) { Dart_KernelCompilationResult ack_result = - result.status == Dart_KernelCompilationStatus_Ok ? - KernelIsolate::AcceptCompilation(): - KernelIsolate::RejectCompilation(); + result.status == Dart_KernelCompilationStatus_Ok + ? KernelIsolate::AcceptCompilation() + : KernelIsolate::RejectCompilation(); if (ack_result.status != Dart_KernelCompilationStatus_Ok) { FATAL( "An error occurred in the CFE while acking the most recent" diff --git a/runtime/vm/dart_api_state.cc b/runtime/vm/dart_api_state.cc index 5c81c57c0e8..88b58261498 100644 --- a/runtime/vm/dart_api_state.cc +++ b/runtime/vm/dart_api_state.cc @@ -12,6 +12,4 @@ #include "vm/thread.h" #include "vm/timeline.h" -namespace dart { - -} // namespace dart +namespace dart {} // namespace dart diff --git a/runtime/vm/debugger.h b/runtime/vm/debugger.h index 7be984828fc..7a3e7d8e8ef 100644 --- a/runtime/vm/debugger.h +++ b/runtime/vm/debugger.h @@ -313,9 +313,7 @@ class ActivationFrame : public ZoneAllocated { // when the frame below (callee) completes. const Closure& closure() const { return closure_; } - const Function& function() const { - return function_; - } + const Function& function() const { return function_; } const Code& code() const { ASSERT(!code_.IsNull()); return code_; diff --git a/runtime/vm/deopt_instructions.cc b/runtime/vm/deopt_instructions.cc index d4914560f3c..aa622f585e0 100644 --- a/runtime/vm/deopt_instructions.cc +++ b/runtime/vm/deopt_instructions.cc @@ -194,8 +194,7 @@ void DeoptContext::VisitObjectPointers(ObjectPointerVisitor* visitor) { } intptr_t DeoptContext::DestStackAdjustment() const { - return dest_frame_size_ - kDartFrameFixedSize - num_args_ - - 1 // For fp. + return dest_frame_size_ - kDartFrameFixedSize - num_args_ - 1 // For fp. - kParamEndSlotFromFp; } @@ -1029,7 +1028,7 @@ DeoptInfoBuilder::DeoptInfoBuilder(Zone* zone, instructions_(), num_args_(num_args), assembler_(assembler), - trie_root_(new (zone) TrieNode()), + trie_root_(new(zone) TrieNode()), current_info_number_(0), frame_start_(-1), materializations_() {} @@ -1347,7 +1346,6 @@ void DeoptTable::GetEntry(const Array& table, *reason ^= table.At(i + 2); } - intptr_t DeoptInfo::FrameSize(const TypedData& packed) { NoSafepointScope no_safepoint; typedef ReadStream::Raw Reader; @@ -1356,7 +1354,6 @@ intptr_t DeoptInfo::FrameSize(const TypedData& packed) { return Reader::Read(&read_stream); } - intptr_t DeoptInfo::NumMaterializations( const GrowableArray& unpacked) { intptr_t num = 0; @@ -1366,7 +1363,6 @@ intptr_t DeoptInfo::NumMaterializations( return num; } - void DeoptInfo::UnpackInto(const Array& table, const TypedData& packed, GrowableArray* unpacked, @@ -1398,7 +1394,6 @@ void DeoptInfo::UnpackInto(const Array& table, } } - void DeoptInfo::Unpack(const Array& table, const TypedData& packed, GrowableArray* unpacked) { @@ -1411,7 +1406,6 @@ void DeoptInfo::Unpack(const Array& table, unpacked->Reverse(); } - const char* DeoptInfo::ToCString(const Array& deopt_table, const TypedData& packed) { #define FORMAT "[%s]" @@ -1438,7 +1432,6 @@ const char* DeoptInfo::ToCString(const Array& deopt_table, #undef FORMAT } - // Returns a bool so it can be asserted. bool DeoptInfo::VerifyDecompression(const GrowableArray& original, const Array& deopt_table, diff --git a/runtime/vm/elf.cc b/runtime/vm/elf.cc index d55ed95ca73..c0f563a2d82 100644 --- a/runtime/vm/elf.cc +++ b/runtime/vm/elf.cc @@ -69,7 +69,9 @@ static constexpr intptr_t kLinearInitValue = -1; ASSERT(name##_ != kLinearInitValue); \ return name##_; \ } \ - bool name##_is_set() const { return name##_ != kLinearInitValue; } \ + bool name##_is_set() const { \ + return name##_ != kLinearInitValue; \ + } \ void set_##name(intptr_t value) { \ ASSERT(value != kLinearInitValue); \ ASSERT_EQUAL(name##_, kLinearInitValue); \ @@ -87,7 +89,9 @@ static constexpr intptr_t kLinearInitValue = -1; V(BitsContainer) \ V(TextSection) V(DataSection) V(BssSection) V(PseudoSection) V(SectionTable) #define DEFINE_TYPE_CHECK_FOR(Type) \ - bool Is##Type() const { return true; } + bool Is##Type() const { \ + return true; \ + } #define DECLARE_SECTION_TYPE_CLASS(Type) class Type; FOR_EACH_SECTION_TYPE(DECLARE_SECTION_TYPE_CLASS) @@ -1154,7 +1158,7 @@ Elf::Elf(Zone* zone, BaseWriteStream* stream, Type type, Dwarf* dwarf) unwrapped_stream_(stream), type_(type), dwarf_(dwarf), - section_table_(new (zone) SectionTable(zone)) { + section_table_(new(zone) SectionTable(zone)) { // Separate debugging information should always have a Dwarf object. ASSERT(type_ == Type::Snapshot || dwarf_ != nullptr); // Assumed by various offset logic in this file. @@ -1414,7 +1418,7 @@ void Elf::FinalizeEhFrame() { #if defined(DART_TARGET_OS_WINDOWS) && \ (defined(TARGET_ARCH_X64) || defined(TARGET_ARCH_ARM64)) // Append Windows unwinding instructions to the end of .text section. - { + { // NOLINT auto* const unwinding_instructions_frame = new (zone_) TextSection(type_); ZoneWriteStream stream( zone(), @@ -1488,8 +1492,8 @@ void Elf::FinalizeEhFrame() { dwarf_stream.u4(stream.Position() - cie_start); // Start address as a PC relative reference. dwarf_stream.RelativeSymbolOffset(portion.label); - dwarf_stream.u4(portion.size); // Size. - dwarf_stream.u1(0); // Augmentation Data length. + dwarf_stream.u4(portion.size); // Size. + dwarf_stream.u1(0); // Augmentation Data length. // Caller FP at FP+kSavedCallerPcSlotFromFp*kWordSize, // where FP is CFA - kCallerSpSlotFromFp*kWordSize. diff --git a/runtime/vm/exceptions.cc b/runtime/vm/exceptions.cc index e27bcf7d068..601598a31e3 100644 --- a/runtime/vm/exceptions.cc +++ b/runtime/vm/exceptions.cc @@ -355,7 +355,7 @@ class ExceptionHandlerFinder : public StackResource { Thread* thread_; Code* code_; bool handler_pc_set_; - intptr_t pc_; // Current pc in the handler frame. + intptr_t pc_; // Current pc in the handler frame. const CatchEntryMoves* catch_entry_moves_ = nullptr; CatchEntryMovesCache* catch_entry_moves_cache_ = nullptr; @@ -627,11 +627,12 @@ static void JumpToExceptionHandler(Thread* thread, } NO_SANITIZE_SAFE_STACK // This function manipulates the safestack pointer. -void Exceptions::JumpToFrame(Thread* thread, - uword program_counter, - uword stack_pointer, - uword frame_pointer, - bool clear_deopt_at_target) { + void + Exceptions::JumpToFrame(Thread* thread, + uword program_counter, + uword stack_pointer, + uword frame_pointer, + bool clear_deopt_at_target) { ASSERT(thread->execution_state() == Thread::kThreadInVM); const uword fp_for_clearing = (clear_deopt_at_target ? frame_pointer + 1 : frame_pointer); diff --git a/runtime/vm/ffi_callback_metadata.h b/runtime/vm/ffi_callback_metadata.h index 18a101836ed..dcc3640fcc2 100644 --- a/runtime/vm/ffi_callback_metadata.h +++ b/runtime/vm/ffi_callback_metadata.h @@ -180,9 +180,7 @@ class FfiCallbackMetadata { // Tells FfiCallbackTrampolineStub how to call into the entry point. Mostly // it's just a flag for whether this is a sync or async callback, but on // IA32 it also encodes whether there's a stack delta of 4 to deal with. - TrampolineType trampoline_type() const { - return trampoline_type_; - } + TrampolineType trampoline_type() const { return trampoline_type_; } }; // Returns the Metadata object for the given trampoline. diff --git a/runtime/vm/growable_array_test.cc b/runtime/vm/growable_array_test.cc index 91d0074a007..99d3ff0d77a 100644 --- a/runtime/vm/growable_array_test.cc +++ b/runtime/vm/growable_array_test.cc @@ -2,8 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -#include "vm/growable_array.h" +#include + #include "platform/assert.h" +#include "vm/growable_array.h" #include "vm/symbols.h" #include "vm/unit_test.h" diff --git a/runtime/vm/hash_map.h b/runtime/vm/hash_map.h index a55f683b8f9..527213847be 100644 --- a/runtime/vm/hash_map.h +++ b/runtime/vm/hash_map.h @@ -530,7 +530,7 @@ class IntKeyRawPointerValueTrait { }; template -class IntMap : public DirectChainedHashMap > { +class IntMap : public DirectChainedHashMap> { public: IntMap() : DirectChainedHashMap>() {} explicit IntMap(Zone* zone) @@ -542,12 +542,12 @@ class IntMap : public DirectChainedHashMap > { inline void Insert(const Key& key, const Value& value) { Pair pair(key, value); - DirectChainedHashMap >::Insert(pair); + DirectChainedHashMap>::Insert(pair); } inline V Lookup(const Key& key) const { Pair* pair = - DirectChainedHashMap >::Lookup(key); + DirectChainedHashMap>::Lookup(key); if (pair == nullptr) { return V(); } else { @@ -556,7 +556,7 @@ class IntMap : public DirectChainedHashMap > { } inline Pair* LookupPair(const Key& key) const { - return DirectChainedHashMap >::Lookup(key); + return DirectChainedHashMap>::Lookup(key); } private: diff --git a/runtime/vm/hash_map_test.cc b/runtime/vm/hash_map_test.cc index 6e31d50d9f1..cc57f268d59 100644 --- a/runtime/vm/hash_map_test.cc +++ b/runtime/vm/hash_map_test.cc @@ -160,9 +160,9 @@ TEST_CASE(DirectChainedHashMapIterator) { IntptrPair p3(3, 3); IntptrPair p4(4, 4); IntptrPair p5(5, 5); - DirectChainedHashMap > map; + DirectChainedHashMap> map; EXPECT(map.IsEmpty()); - DirectChainedHashMap >::Iterator it = + DirectChainedHashMap>::Iterator it = map.GetIterator(); EXPECT(it.Next() == nullptr); it.Reset(); diff --git a/runtime/vm/heap/freelist.cc b/runtime/vm/heap/freelist.cc index 1be1306b431..ee5229ae33a 100644 --- a/runtime/vm/heap/freelist.cc +++ b/runtime/vm/heap/freelist.cc @@ -77,8 +77,7 @@ FreeList::FreeList() : mutex_() { Reset(); } -FreeList::~FreeList() { -} +FreeList::~FreeList() {} uword FreeList::TryAllocate(intptr_t size, bool is_protected) { MutexLocker ml(&mutex_); diff --git a/runtime/vm/heap/gc_shared.cc b/runtime/vm/heap/gc_shared.cc index f9cc31dd2c8..a58fdce25d8 100644 --- a/runtime/vm/heap/gc_shared.cc +++ b/runtime/vm/heap/gc_shared.cc @@ -30,12 +30,15 @@ bool GCLinkedLists::IsEmpty() { #undef FOREACH } +// clang-format off void GCLinkedLists::FlushInto(GCLinkedLists* to) { #define FOREACH(type, var) var.FlushInto(&to->var); - GC_LINKED_LIST(FOREACH) + GC_LINKED_LIST(FOREACH) #undef FOREACH } +// clang-format on + Heap::Space SpaceForExternal(FinalizerEntryPtr raw_entry) { // As with WeakTables, Smis are "old". return raw_entry->untag()->value()->IsImmediateOrOldObject() ? Heap::kOld diff --git a/runtime/vm/heap/heap.cc b/runtime/vm/heap/heap.cc index 19de6f1717d..00abe6623a7 100644 --- a/runtime/vm/heap/heap.cc +++ b/runtime/vm/heap/heap.cc @@ -781,7 +781,8 @@ bool Heap::VerifyGC(const char* msg, MarkExpectation mark_expectation) { void Heap::PrintSizes() const { OS::PrintErr( - "New space (%" Pd "k of %" Pd "k) " + "New space (%" Pd "k of %" Pd + "k) " "Old space (%" Pd "k of %" Pd "k)\n", (UsedInWords(kNew) / KBInWords), (CapacityInWords(kNew) / KBInWords), (UsedInWords(kOld) / KBInWords), (CapacityInWords(kOld) / KBInWords)); diff --git a/runtime/vm/heap/page.h b/runtime/vm/heap/page.h index 75de57017b6..4be0412e79b 100644 --- a/runtime/vm/heap/page.h +++ b/runtime/vm/heap/page.h @@ -176,20 +176,14 @@ class Page { void VisitRememberedCards(ObjectPointerVisitor* visitor); void ResetProgressBar(); - Thread* owner() const { - return owner_; - } + Thread* owner() const { return owner_; } // Remember the limit to which objects have been copied. - void RecordSurvivors() { - survivor_end_ = object_end(); - } + void RecordSurvivors() { survivor_end_ = object_end(); } // Move survivor end to the end of the to_ space, making all surviving // objects candidates for promotion next time. - void EarlyTenure() { - survivor_end_ = end_; - } + void EarlyTenure() { survivor_end_ = end_; } uword promo_candidate_words() const { return (survivor_end_ - object_start()) / kWordSize; @@ -250,12 +244,8 @@ class Page { top_ -= size; } - bool IsSurvivor(uword raw_addr) const { - return raw_addr < survivor_end_; - } - bool IsResolved() const { - return top_ == resolved_top_; - } + bool IsSurvivor(uword raw_addr) const { return raw_addr < survivor_end_; } + bool IsResolved() const { return top_ == resolved_top_; } private: void RememberCard(uword slot) { diff --git a/runtime/vm/heap/scavenger.cc b/runtime/vm/heap/scavenger.cc index badc4b19aa1..5f2536124bb 100644 --- a/runtime/vm/heap/scavenger.cc +++ b/runtime/vm/heap/scavenger.cc @@ -345,12 +345,8 @@ class ScavengerVisitorBase : public ObjectPointerVisitor { } } - Page* head() const { - return head_; - } - Page* tail() const { - return tail_; - } + Page* head() const { return head_; } + Page* tail() const { return tail_; } static bool ForwardOrSetNullIfCollected(ObjectPtr parent, CompressedObjectPtr* ptr_address); diff --git a/runtime/vm/heap/scavenger.h b/runtime/vm/heap/scavenger.h index c61452f91a6..247df43c706 100644 --- a/runtime/vm/heap/scavenger.h +++ b/runtime/vm/heap/scavenger.h @@ -234,9 +234,7 @@ class Scavenger { return max_pool_size > 0 ? max_pool_size : 1; } - Page* head() const { - return to_->head(); - } + Page* head() const { return to_->head(); } void Prune(MarkingStackBlock** from, MarkingStack* to); void Forward(MarkingStack* stack); diff --git a/runtime/vm/image_snapshot.cc b/runtime/vm/image_snapshot.cc index b738e456eee..4e383ad6271 100644 --- a/runtime/vm/image_snapshot.cc +++ b/runtime/vm/image_snapshot.cc @@ -955,6 +955,7 @@ intptr_t ImageWriter::AlignWithBreakInstructions(intptr_t alignment, remaining -= compiler::target::kWordSize) { bytes_written += WriteTargetWord(kBreakInstructionFiller); } + // clang-format off #if defined(TARGET_ARCH_ARM) // All instructions are 4 bytes long on ARM architectures, so on 32-bit ARM // there won't be any padding. @@ -973,6 +974,7 @@ intptr_t ImageWriter::AlignWithBreakInstructions(intptr_t alignment, #else #error Unexpected architecture. #endif + // clang-format on ASSERT_EQUAL(bytes_written, Utils::RoundUp(offset, alignment) - offset); return bytes_written; } diff --git a/runtime/vm/image_snapshot.h b/runtime/vm/image_snapshot.h index dd31d97f44c..fd3224e583e 100644 --- a/runtime/vm/image_snapshot.h +++ b/runtime/vm/image_snapshot.h @@ -548,9 +548,7 @@ class ImageWriter : public ValueObject { #endif uint8_t flags; - bool is_object() const { - return IsObjectField::decode(flags); - } + bool is_object() const { return IsObjectField::decode(flags); } bool is_original_object() const { return IsOriginalObjectField::decode(flags); } diff --git a/runtime/vm/instructions_x64.cc b/runtime/vm/instructions_x64.cc index 11ec2c846b0..569ee866414 100644 --- a/runtime/vm/instructions_x64.cc +++ b/runtime/vm/instructions_x64.cc @@ -79,10 +79,10 @@ intptr_t TypeTestingStubCallPattern::GetSubtypeTestCachePoolIndex() { 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] + 0x4d, 0x8b, 0x8f, -1, -1, -1, -1, // movq R9, [PP + offset] }; uword pc = pc_; diff --git a/runtime/vm/isolate.h b/runtime/vm/isolate.h index 01f87a6abfd..f58fde582e2 100644 --- a/runtime/vm/isolate.h +++ b/runtime/vm/isolate.h @@ -488,18 +488,14 @@ class IsolateGroup : public IntrusiveDListEntry { // Class table for the program loaded into this isolate group. // // This table is modified by kernel loading. - ClassTable* class_table() const { - return class_table_; - } + ClassTable* class_table() const { return class_table_; } // Class table used for heap walks by GC visitors. Usually it // is the same table as one in |class_table_|, except when in the // middle of the reload. // // See comment for |ClassTable| class for more details. - ClassTable* heap_walk_class_table() const { - return heap_walk_class_table_; - } + ClassTable* heap_walk_class_table() const { return heap_walk_class_table_; } void CloneClassTableForReload(); void RestoreOriginalClassTable(); diff --git a/runtime/vm/isolate_reload.cc b/runtime/vm/isolate_reload.cc index 869338a8c2d..34cae6e1a6f 100644 --- a/runtime/vm/isolate_reload.cc +++ b/runtime/vm/isolate_reload.cc @@ -828,7 +828,7 @@ bool IsolateGroupReloadContext::Reload(bool force_reload, if (FLAG_gc_during_reload) { // We force the GC to compact, which is more likely to discover untracked // pointers (and other issues, like incorrect class table). - heap->CollectAllGarbage(GCReason::kDebugging, /*compact=*/ true); + heap->CollectAllGarbage(GCReason::kDebugging, /*compact=*/true); } // Clone the class table. @@ -840,7 +840,7 @@ bool IsolateGroupReloadContext::Reload(bool force_reload, if (FLAG_gc_during_reload) { // We force the GC to compact, which is more likely to discover untracked // pointers (and other issues, like incorrect class table). - heap->CollectAllGarbage(GCReason::kDebugging, /*compact=*/ true); + heap->CollectAllGarbage(GCReason::kDebugging, /*compact=*/true); } // We synchronously load the hot-reload kernel diff (which includes changed @@ -869,7 +869,7 @@ bool IsolateGroupReloadContext::Reload(bool force_reload, if (FLAG_gc_during_reload) { // We force the GC to compact, which is more likely to discover untracked // pointers (and other issues, like incorrect class table). - heap->CollectAllGarbage(GCReason::kDebugging, /*compact=*/ true); + heap->CollectAllGarbage(GCReason::kDebugging, /*compact=*/true); } // If we use the CFE and performed a compilation, we need to notify that @@ -902,7 +902,7 @@ bool IsolateGroupReloadContext::Reload(bool force_reload, if (FLAG_gc_during_reload) { // We force the GC to compact, which is more likely to discover // untracked pointers (and other issues, like incorrect class table). - heap->CollectAllGarbage(GCReason::kDebugging, /*compact=*/ true); + heap->CollectAllGarbage(GCReason::kDebugging, /*compact=*/true); } const intptr_t count = locator.count(); if (count > 0) { @@ -940,7 +940,7 @@ bool IsolateGroupReloadContext::Reload(bool force_reload, if (FLAG_gc_during_reload) { // We force the GC to compact, which is more likely to discover // untracked pointers (and other issues, like incorrect class table). - heap->CollectAllGarbage(GCReason::kDebugging, /*compact=*/ true); + heap->CollectAllGarbage(GCReason::kDebugging, /*compact=*/true); } } if (FLAG_identity_reload) { @@ -1576,7 +1576,6 @@ void ProgramReloadContext::CheckpointLibraries() { object_store()->set_root_library(Library::Handle()); } - void ProgramReloadContext::RollbackLibraries() { TIR_Print("---- ROLLING BACK LIBRARY CHANGES\n"); Thread* thread = Thread::Current(); diff --git a/runtime/vm/kernel.cc b/runtime/vm/kernel.cc index af304e3db70..f5e73535666 100644 --- a/runtime/vm/kernel.cc +++ b/runtime/vm/kernel.cc @@ -15,7 +15,6 @@ #include "vm/parser.h" // For Parser::kParameter* constants. #include "vm/stack_frame.h" - namespace dart { namespace kernel { diff --git a/runtime/vm/kernel.h b/runtime/vm/kernel.h index dc60fae5e8a..464556d5262 100644 --- a/runtime/vm/kernel.h +++ b/runtime/vm/kernel.h @@ -73,7 +73,8 @@ class Program { intptr_t buffer_length, const char** error = nullptr); static std::unique_ptr ReadFromTypedData( - const ExternalTypedData& typed_data, const char** error = nullptr); + const ExternalTypedData& typed_data, + const char** error = nullptr); bool is_single_program() { return single_program_; } NameIndex main_method() { return main_method_reference_; } diff --git a/runtime/vm/kernel_binary.cc b/runtime/vm/kernel_binary.cc index 2dacbaeb929..c3c43f760c5 100644 --- a/runtime/vm/kernel_binary.cc +++ b/runtime/vm/kernel_binary.cc @@ -180,7 +180,8 @@ std::unique_ptr Program::ReadFrom(Reader* reader, const char** error) { } std::unique_ptr Program::ReadFromFile( - const char* script_uri, const char** error /* = nullptr */) { + const char* script_uri, + const char** error /* = nullptr */) { Thread* thread = Thread::Current(); auto isolate_group = thread->isolate_group(); if (script_uri == nullptr) { @@ -222,7 +223,8 @@ std::unique_ptr Program::ReadFromBuffer(const uint8_t* buffer, } std::unique_ptr Program::ReadFromTypedData( - const ExternalTypedData& typed_data, const char** error) { + const ExternalTypedData& typed_data, + const char** error) { kernel::Reader reader(typed_data); return kernel::Program::ReadFrom(&reader, error); } diff --git a/runtime/vm/kernel_binary.h b/runtime/vm/kernel_binary.h index 312eed35ea4..af16ca0b36c 100644 --- a/runtime/vm/kernel_binary.h +++ b/runtime/vm/kernel_binary.h @@ -501,9 +501,7 @@ class Reader : public ValueObject { friend class AlternativeReadingScope; Reader(const uint8_t* buffer, intptr_t size) - : thread_(nullptr), - raw_buffer_(buffer), - size_(size) {} + : thread_(nullptr), raw_buffer_(buffer), size_(size) {} void Init() { ASSERT(typed_data_->IsExternalOrExternalView()); diff --git a/runtime/vm/kernel_isolate.h b/runtime/vm/kernel_isolate.h index 18e77453053..e18049dda07 100644 --- a/runtime/vm/kernel_isolate.h +++ b/runtime/vm/kernel_isolate.h @@ -112,12 +112,8 @@ 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_; diff --git a/runtime/vm/message_handler.h b/runtime/vm/message_handler.h index c519f6ee891..229ba933ea6 100644 --- a/runtime/vm/message_handler.h +++ b/runtime/vm/message_handler.h @@ -256,7 +256,7 @@ class MessageHandler { bool paused_for_messages_; PortSet ports_; // Only accessed by [PortMap], protected by [PortMap]s lock. - intptr_t paused_; // The number of pause messages received. + intptr_t paused_; // The number of pause messages received. #if !defined(PRODUCT) bool should_pause_on_start_; bool should_pause_on_exit_; diff --git a/runtime/vm/native_arguments.h b/runtime/vm/native_arguments.h index 7c0ab2b085f..50f27bb9dec 100644 --- a/runtime/vm/native_arguments.h +++ b/runtime/vm/native_arguments.h @@ -225,10 +225,10 @@ class NativeArguments { return num_hidden_args; } - Thread* thread_; // Current thread pointer. - intptr_t argc_tag_; // Encodes argument count and invoked native call type. - ObjectPtr* argv_; // Pointer to an array of arguments to runtime call. - ObjectPtr* retval_; // Pointer to the return value area. + Thread* thread_; // Current thread pointer. + intptr_t argc_tag_; // Encodes argument count and invoked native call type. + ObjectPtr* argv_; // Pointer to an array of arguments to runtime call. + ObjectPtr* retval_; // Pointer to the return value area. }; } // namespace dart diff --git a/runtime/vm/native_message_handler.h b/runtime/vm/native_message_handler.h index 0e57e0c8123..f2cd91a7559 100644 --- a/runtime/vm/native_message_handler.h +++ b/runtime/vm/native_message_handler.h @@ -5,6 +5,8 @@ #ifndef RUNTIME_VM_NATIVE_MESSAGE_HANDLER_H_ #define RUNTIME_VM_NATIVE_MESSAGE_HANDLER_H_ +#include + #include "include/dart_api.h" #include "include/dart_native_api.h" #include "vm/message_handler.h" diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc index a1757c8d7ce..3b0fbd18aa4 100644 --- a/runtime/vm/object.cc +++ b/runtime/vm/object.cc @@ -5124,29 +5124,31 @@ bool Class::InjectCIDFields() const { Smi& value = Smi::Handle(zone); String& field_name = String::Handle(zone); + // clang-format off static const struct { const char* const field_name; const intptr_t cid; } cid_fields[] = { #define CLASS_LIST_WITH_NULL(V) \ - V(Null) \ - CLASS_LIST_NO_OBJECT(V) -#define ADD_SET_FIELD(clazz) {"cid" #clazz, k##clazz##Cid}, - CLASS_LIST_WITH_NULL(ADD_SET_FIELD) + V(Null) \ + CLASS_LIST_NO_OBJECT(V) +#define ADD_SET_FIELD(clazz) \ + {"cid" #clazz, k##clazz##Cid}, + CLASS_LIST_WITH_NULL(ADD_SET_FIELD) #undef ADD_SET_FIELD #undef CLASS_LIST_WITH_NULL #define ADD_SET_FIELD(clazz) \ - {"cid" #clazz, kTypedData##clazz##Cid}, \ - {"cid" #clazz "View", kTypedData##clazz##ViewCid}, \ - {"cidExternal" #clazz, kExternalTypedData##clazz##Cid}, \ - {"cidUnmodifiable" #clazz "View", \ - kUnmodifiableTypedData##clazz##ViewCid}, - CLASS_LIST_TYPED_DATA(ADD_SET_FIELD) + {"cid" #clazz, kTypedData##clazz##Cid}, \ + {"cid" #clazz "View", kTypedData##clazz##ViewCid}, \ + {"cidExternal" #clazz, kExternalTypedData##clazz##Cid}, \ + {"cidUnmodifiable" #clazz "View", kUnmodifiableTypedData##clazz##ViewCid}, \ + CLASS_LIST_TYPED_DATA(ADD_SET_FIELD) #undef ADD_SET_FIELD - // Used in const hashing to determine whether we're dealing with a - // user-defined const. See lib/_internal/vm/lib/compact_hash.dart. - {"numPredefinedCids", kNumPredefinedCids}, + // Used in const hashing to determine whether we're dealing with a + // user-defined const. See lib/_internal/vm/lib/compact_hash.dart. + {"numPredefinedCids", kNumPredefinedCids}, }; + // clang-format on const AbstractType& field_type = Type::Handle(zone, Type::IntType()); for (size_t i = 0; i < ARRAY_SIZE(cid_fields); i++) { @@ -25598,7 +25600,7 @@ const intptr_t 16, // kTypedDataFloat32x4ArrayCid. 16, // kTypedDataInt32x4ArrayCid. 16, // kTypedDataFloat64x2ArrayCid, -}; + }; bool TypedData::CanonicalizeEquals(const Instance& other) const { if (this->ptr() == other.ptr()) { diff --git a/runtime/vm/object.h b/runtime/vm/object.h index dbca01f89b0..9b4509b4ec6 100644 --- a/runtime/vm/object.h +++ b/runtime/vm/object.h @@ -288,7 +288,9 @@ extern "C" void DFLRT_ExitSafepoint(NativeArguments __unusable_); ASSERT(ptr() != null()); \ return const_cast(ptr()->untag()); \ } \ - static intptr_t NextFieldOffset() { return -kWordSize; } \ + static intptr_t NextFieldOffset() { \ + return -kWordSize; \ + } \ SNAPSHOT_SUPPORT(rettype) \ friend class Object; \ friend class StackFrame; \ @@ -1051,7 +1053,9 @@ class Object { } #else #define PRECOMPILER_WSR_FIELD_DECLARATION(Type, Name) \ - Type##Ptr Name() const { return untag()->Name(); } \ + Type##Ptr Name() const { \ + return untag()->Name(); \ + } \ void set_##Name(const Type& value) const; #endif @@ -1578,9 +1582,7 @@ class Class : public Object { } // Check if this class represents the 'Record' class. - bool IsRecordClass() const { - return id() == kRecordCid; - } + bool IsRecordClass() const { return id() == kRecordCid; } static bool IsInFullSnapshot(ClassPtr cls) { NoSafepointScope no_safepoint; @@ -3173,9 +3175,7 @@ class Function : public Object { static intptr_t code_offset() { return OFFSET_OF(UntaggedFunction, code_); } - uword entry_point() const { - return EntryPointOf(ptr()); - } + uword entry_point() const { return EntryPointOf(ptr()); } static uword EntryPointOf(const FunctionPtr function) { return function->untag()->entry_point_; } @@ -3449,9 +3449,7 @@ class Function : public Object { #if !defined(PRODUCT) && \ (defined(DART_PRECOMPILER) || defined(DART_PRECOMPILED_RUNTIME)) - int32_t line() const { - return untag()->token_pos_.Serialize(); - } + int32_t line() const { return untag()->token_pos_.Serialize(); } void set_line(int32_t line) const { StoreNonPointer(&untag()->token_pos_, TokenPosition::Deserialize(line)); @@ -4684,9 +4682,7 @@ class Field : public Object { const char* GuardedPropertiesAsCString() const; - bool is_unboxed() const { - return UnboxedBit::decode(kind_bits()); - } + bool is_unboxed() const { return UnboxedBit::decode(kind_bits()); } // Field unboxing decisions are based either on static types (JIT) or // inferred types (AOT). See the callers of this function. @@ -12588,15 +12584,11 @@ class SuspendState : public Instance { intptr_t frame_size() const { return untag()->frame_size_; } - InstancePtr function_data() const { - return untag()->function_data(); - } + InstancePtr function_data() const { return untag()->function_data(); } ClosurePtr then_callback() const { return untag()->then_callback(); } - ClosurePtr error_callback() const { - return untag()->error_callback(); - } + ClosurePtr error_callback() const { return untag()->error_callback(); } // Returns Code object corresponding to the suspended function. CodePtr GetCodeObject() const; diff --git a/runtime/vm/object_graph_copy.cc b/runtime/vm/object_graph_copy.cc index f59b90e8dfc..4958c39557d 100644 --- a/runtime/vm/object_graph_copy.cc +++ b/runtime/vm/object_graph_copy.cc @@ -1728,12 +1728,12 @@ class ObjectCopy : public Base { #define COPY_TO(clazz) case kTypedData##clazz##Cid: - CLASS_LIST_TYPED_DATA(COPY_TO) { - typename Types::TypedData casted_from = Types::CastTypedData(from); - typename Types::TypedData casted_to = Types::CastTypedData(to); - CopyTypedData(casted_from, casted_to); - return; - } + CLASS_LIST_TYPED_DATA(COPY_TO) { + typename Types::TypedData casted_from = Types::CastTypedData(from); + typename Types::TypedData casted_to = Types::CastTypedData(to); + CopyTypedData(casted_from, casted_to); + return; + } #undef COPY_TO case kByteDataViewCid: @@ -2095,14 +2095,16 @@ class ObjectCopy : public Base { Base::EnqueueWeakReference(from); } + // clang-format off #define DEFINE_UNSUPPORTED(clazz) \ void Copy##clazz(typename Types::clazz from, typename Types::clazz to) { \ - FATAL("Objects of type " #clazz " should not occur in object graphs"); \ + FATAL("Objects of type " #clazz " should not occur in object graphs"); \ } FOR_UNSUPPORTED_CLASSES(DEFINE_UNSUPPORTED) #undef DEFINE_UNSUPPORTED + // clang-format on UntaggedObject* UntagObject(typename Types::Object obj) { return Types::GetObjectPtr(obj).Decompress(Base::heap_base_).untag(); diff --git a/runtime/vm/os_thread_fuchsia.cc b/runtime/vm/os_thread_fuchsia.cc index 4546b88f7fd..c5294233172 100644 --- a/runtime/vm/os_thread_fuchsia.cc +++ b/runtime/vm/os_thread_fuchsia.cc @@ -240,17 +240,14 @@ uword OSThread::GetCurrentSafestackPointer() { uword result; #if defined(HOST_ARCH_X64) #define _loadfsword(index) "movq %%fs:" STRINGIFY(index) ", %0" - asm volatile( - _loadfsword(ZX_TLS_UNSAFE_SP_OFFSET) - : "=r"(result) // outputs + asm volatile(_loadfsword(ZX_TLS_UNSAFE_SP_OFFSET) + : "=r"(result) // outputs ); #undef _loadfsword #elif defined(HOST_ARCH_ARM64) #define _loadword(index) "ldr %0, [%0, " STRINGIFY(index) "]" - asm volatile( - "mrs %0, TPIDR_EL0;\n" - _loadword(ZX_TLS_UNSAFE_SP_OFFSET) - : "=r"(result) // outputs + asm volatile("mrs %0, TPIDR_EL0;\n" _loadword(ZX_TLS_UNSAFE_SP_OFFSET) + : "=r"(result) // outputs ); #else #error "Architecture not supported" @@ -264,23 +261,20 @@ void OSThread::SetCurrentSafestackPointer(uword ssp) { #if defined(HOST_ARCH_X64) #define str(s) #s #define _storefsword(index) "movq %0, %%fs:" str(index) - asm volatile( - _storefsword(ZX_TLS_UNSAFE_SP_OFFSET) - : // outputs. - : "r"(ssp) // inputs. - : // clobbered. + asm volatile(_storefsword(ZX_TLS_UNSAFE_SP_OFFSET) + : // outputs. + : "r"(ssp) // inputs. + : // clobbered. ); #undef _storefsword #undef str #elif defined(HOST_ARCH_ARM64) #define _storeword(index) "str %1, [%0, " STRINGIFY(index) "]" uword tmp; - asm volatile( - "mrs %0, TPIDR_EL0;\n" - _storeword(ZX_TLS_UNSAFE_SP_OFFSET) - : "=r"(tmp) // outputs. - : "r"(ssp) // inputs. - : // clobbered. + asm volatile("mrs %0, TPIDR_EL0;\n" _storeword(ZX_TLS_UNSAFE_SP_OFFSET) + : "=r"(tmp) // outputs. + : "r"(ssp) // inputs. + : // clobbered. ); #else #error "Architecture not supported" diff --git a/runtime/vm/port.h b/runtime/vm/port.h index b7c19059703..e5afe8fb61e 100644 --- a/runtime/vm/port.h +++ b/runtime/vm/port.h @@ -42,7 +42,6 @@ class PortMap : public AllStatic { static bool PostMessage(std::unique_ptr message, bool before_events = false); - // Returns the owning Isolate for port 'id'. static Isolate* GetIsolate(Dart_Port id); diff --git a/runtime/vm/profiler_service.h b/runtime/vm/profiler_service.h index 1c4634ad5a5..465b1f56523 100644 --- a/runtime/vm/profiler_service.h +++ b/runtime/vm/profiler_service.h @@ -365,7 +365,6 @@ class ProfileCodeTable : public ZoneAllocated { ZoneGrowableArray table_; }; - // The model for a profile. Most of the model is zone allocated, therefore // a zone must be created that lives longer than this object. class Profile : public ValueObject { diff --git a/runtime/vm/program_visitor.cc b/runtime/vm/program_visitor.cc index af88a749626..dd7bbe94839 100644 --- a/runtime/vm/program_visitor.cc +++ b/runtime/vm/program_visitor.cc @@ -642,7 +642,7 @@ void ProgramVisitor::NormalizeAndDedupCompressedStackMaps(Thread* thread) { class NormalizeAndDedupCompressedStackMapsVisitor : public CodeVisitor, public Deduper> { + PointerSetKeyValueTrait> { public: NormalizeAndDedupCompressedStackMapsVisitor(Zone* zone, IsolateGroup* isolate_group) @@ -800,8 +800,7 @@ class TypedDataDeduper : public Deduper { }; void ProgramVisitor::DedupDeoptEntries(Thread* thread) { - class DedupDeoptEntriesVisitor : public CodeVisitor, - public TypedDataDeduper { + class DedupDeoptEntriesVisitor : public CodeVisitor, public TypedDataDeduper { public: explicit DedupDeoptEntriesVisitor(Zone* zone) : TypedDataDeduper(zone), diff --git a/runtime/vm/program_visitor.h b/runtime/vm/program_visitor.h index b743e0abcd0..50d267f03f9 100644 --- a/runtime/vm/program_visitor.h +++ b/runtime/vm/program_visitor.h @@ -54,7 +54,7 @@ class ClassVisitor : public ValueObject { virtual bool IsFunctionVisitor() const { return false; } const FunctionVisitor* AsFunctionVisitor() const { return const_cast( - const_cast(this)->AsFunctionVisitor()); + const_cast(this)->AsFunctionVisitor()); } FunctionVisitor* AsFunctionVisitor() { if (!IsFunctionVisitor()) return nullptr; @@ -64,7 +64,7 @@ class ClassVisitor : public ValueObject { virtual bool IsCodeVisitor() const { return false; } const CodeVisitor* AsCodeVisitor() const { return const_cast( - const_cast(this)->AsCodeVisitor()); + const_cast(this)->AsCodeVisitor()); } CodeVisitor* AsCodeVisitor() { if (!IsCodeVisitor()) return nullptr; diff --git a/runtime/vm/raw_object.h b/runtime/vm/raw_object.h index 3ae42a4327f..01bed8d10ba 100644 --- a/runtime/vm/raw_object.h +++ b/runtime/vm/raw_object.h @@ -939,8 +939,12 @@ inline intptr_t ObjectPtr::GetClassId() const { } \ \ protected: \ - type* array_name() { OPEN_ARRAY_START(type, type); } \ - type const* array_name() const { OPEN_ARRAY_START(type, type); } \ + type* array_name() { \ + OPEN_ARRAY_START(type, type); \ + } \ + type const* array_name() const { \ + OPEN_ARRAY_START(type, type); \ + } \ VISIT_TO_PAYLOAD_END(type) #define COMPRESSED_VARIABLE_POINTER_FIELDS(type, accessor_name, array_name) \ @@ -1579,9 +1583,9 @@ class UntaggedField : public UntaggedObject { #endif // !defined(DART_PRECOMPILED_RUNTIME) friend class CidRewriteVisitor; - friend class GuardFieldClassInstr; // For sizeof(guarded_cid_/...) - friend class LoadFieldInstr; // For sizeof(guarded_cid_/...) - friend class StoreFieldInstr; // For sizeof(guarded_cid_/...) + friend class GuardFieldClassInstr; // For sizeof(guarded_cid_/...) + friend class LoadFieldInstr; // For sizeof(guarded_cid_/...) + friend class StoreFieldInstr; // For sizeof(guarded_cid_/...) }; class alignas(8) UntaggedScript : public UntaggedObject { diff --git a/runtime/vm/raw_object_fields.cc b/runtime/vm/raw_object_fields.cc index 81dbe2a1a35..e5cbd571a14 100644 --- a/runtime/vm/raw_object_fields.cc +++ b/runtime/vm/raw_object_fields.cc @@ -251,8 +251,7 @@ namespace dart { F(Function, positional_parameter_names_) \ F(Function, unoptimized_code_) -#define JIT_NON_PRODUCT_CLASSES_AND_FIELDS(F) \ - F(Script, constant_coverage_) +#define JIT_NON_PRODUCT_CLASSES_AND_FIELDS(F) F(Script, constant_coverage_) #define NON_PRODUCT_CLASSES_AND_FIELDS(F) \ F(Class, user_name_) \ @@ -289,30 +288,31 @@ bool is_compressed_pointer() { } void OffsetsTable::Init() { - static const OffsetsTable::OffsetsTableEntry table[] { + static const OffsetsTable::OffsetsTableEntry table[]{ #define DEFINE_OFFSETS_TABLE_ENTRY(class_name, field_name) \ {class_name::kClassId, #field_name, \ is_compressed_pointer(), \ OFFSET_OF(Untagged##class_name, field_name)}, - COMMON_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY) + COMMON_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY) #if !defined(PRODUCT) - NON_PRODUCT_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY) + NON_PRODUCT_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY) #endif #if !defined(HASH_IN_OBJECT_HEADER) - NON_HEADER_HASH_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY) + NON_HEADER_HASH_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY) #endif #if defined(DART_PRECOMPILED_RUNTIME) - AOT_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY) + AOT_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY) #if !defined(PRODUCT) - AOT_NON_PRODUCT_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY) + AOT_NON_PRODUCT_CLASSES_AND_FIELDS( + DEFINE_OFFSETS_TABLE_ENTRY) #endif #else - JIT_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY) + JIT_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY) #if !defined(PRODUCT) - JIT_NON_PRODUCT_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY) + JIT_NON_PRODUCT_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY) #endif #endif @@ -320,7 +320,7 @@ void OffsetsTable::Init() { }; for (const OffsetsTableEntry& entry : table) { - field_offsets_table.Add(entry); + field_offsets_table.Add(entry); } } diff --git a/runtime/vm/regexp.cc b/runtime/vm/regexp.cc index 19937f2b3a2..a930e5cedf4 100644 --- a/runtime/vm/regexp.cc +++ b/runtime/vm/regexp.cc @@ -826,7 +826,9 @@ ActionNode* ActionNode::EmptyMatchCheck(intptr_t start_register, } #define DEFINE_ACCEPT(Type) \ - void Type##Node::Accept(NodeVisitor* visitor) { visitor->Visit##Type(this); } + void Type##Node::Accept(NodeVisitor* visitor) { \ + visitor->Visit##Type(this); \ + } FOR_EACH_NODE_TYPE(DEFINE_ACCEPT) #undef DEFINE_ACCEPT diff --git a/runtime/vm/regexp.h b/runtime/vm/regexp.h index d8d0feb3232..8657ec70c17 100644 --- a/runtime/vm/regexp.h +++ b/runtime/vm/regexp.h @@ -657,7 +657,7 @@ class TextNode : public SeqRegExpNode { bool read_backward, RegExpNode* on_success) : SeqRegExpNode(on_success), - elms_(new (zone()) ZoneGrowableArray(1)), + elms_(new(zone()) ZoneGrowableArray(1)), read_backward_(read_backward) { elms_->Add(TextElement::CharClass(that)); } @@ -895,7 +895,7 @@ class ChoiceNode : public RegExpNode { public: explicit ChoiceNode(intptr_t expected_size, Zone* zone) : RegExpNode(zone), - alternatives_(new (zone) + alternatives_(new(zone) ZoneGrowableArray(expected_size)), not_at_start_(false), being_calculated_(false) {} @@ -1096,7 +1096,7 @@ ContainedInLattice AddRange(ContainedInLattice a, class BoyerMoorePositionInfo : public ZoneAllocated { public: explicit BoyerMoorePositionInfo(Zone* zone) - : map_(new (zone) ZoneGrowableArray(kMapSize)), + : map_(new(zone) ZoneGrowableArray(kMapSize)), map_count_(0), w_(kNotYet), s_(kNotYet), diff --git a/runtime/vm/regexp_assembler.cc b/runtime/vm/regexp_assembler.cc index c36aa3811d7..80116ef2146 100644 --- a/runtime/vm/regexp_assembler.cc +++ b/runtime/vm/regexp_assembler.cc @@ -16,8 +16,9 @@ namespace dart { void PrintUtf16(uint16_t c) { - const char* format = - (0x20 <= c && c <= 0x7F) ? "%c" : (c <= 0xff) ? "\\x%02x" : "\\u%04x"; + const char* format = (0x20 <= c && c <= 0x7F) ? "%c" + : (c <= 0xff) ? "\\x%02x" + : "\\u%04x"; OS::PrintErr(format, c); } diff --git a/runtime/vm/regexp_ast.cc b/runtime/vm/regexp_ast.cc index acbc9870e9b..ad0c3002041 100644 --- a/runtime/vm/regexp_ast.cc +++ b/runtime/vm/regexp_ast.cc @@ -27,8 +27,12 @@ FOR_EACH_REG_EXP_TREE_TYPE(MAKE_TYPE_CASE) #undef MAKE_TYPE_CASE #define MAKE_TYPE_CASE(Name) \ - RegExp##Name* RegExp##Name::As##Name() { return this; } \ - bool RegExp##Name::Is##Name() const { return true; } + RegExp##Name* RegExp##Name::As##Name() { \ + return this; \ + } \ + bool RegExp##Name::Is##Name() const { \ + return true; \ + } FOR_EACH_REG_EXP_TREE_TYPE(MAKE_TYPE_CASE) #undef MAKE_TYPE_CASE diff --git a/runtime/vm/regexp_parser.h b/runtime/vm/regexp_parser.h index 9ccd672fea5..6ab2862313a 100644 --- a/runtime/vm/regexp_parser.h +++ b/runtime/vm/regexp_parser.h @@ -164,7 +164,7 @@ class RegExpParser : public ValueObject { RegExpFlags flags, Zone* zone) : previous_state_(previous_state), - builder_(new (zone) RegExpBuilder(flags)), + builder_(new(zone) RegExpBuilder(flags)), group_type_(group_type), lookaround_type_(lookaround_type), disjunction_capture_index_(disjunction_capture_index), diff --git a/runtime/vm/scopes.cc b/runtime/vm/scopes.cc index ba00a5afdee..9931a468349 100644 --- a/runtime/vm/scopes.cc +++ b/runtime/vm/scopes.cc @@ -12,7 +12,6 @@ #include "vm/stack_frame.h" #include "vm/symbols.h" - namespace dart { DEFINE_FLAG(bool, @@ -143,7 +142,7 @@ VariableIndex LocalScope::AllocateVariables(const Function& function, ASSERT(num_parameters >= 0); // Parameters must be listed first and must all appear in the top scope. ASSERT(num_parameters <= num_variables()); - int pos = 0; // Current variable position. + int pos = 0; // Current variable position. VariableIndex next_index = first_parameter_index; // Current free frame index. diff --git a/runtime/vm/service.cc b/runtime/vm/service.cc index 3c5593ea4f9..8cb810c15dd 100644 --- a/runtime/vm/service.cc +++ b/runtime/vm/service.cc @@ -5825,19 +5825,17 @@ static void GetDefaultClassesAliases(Thread* thread, JSONStream* js) { CLASS_LIST_SETS(DEFINE_ADD_VALUE_F_CID) } #define DEFINE_ADD_MAP_KEY(clazz) \ - { \ - JSONArray internals(&map, #clazz); \ - DEFINE_ADD_VALUE_F_CID(TypedData##clazz) \ - DEFINE_ADD_VALUE_F_CID(TypedData##clazz##View) \ - DEFINE_ADD_VALUE_F_CID(ExternalTypedData##clazz) \ - DEFINE_ADD_VALUE_F_CID(UnmodifiableTypedData##clazz##View) \ + {JSONArray internals(&map, #clazz); \ + DEFINE_ADD_VALUE_F_CID(TypedData##clazz) \ + DEFINE_ADD_VALUE_F_CID(TypedData##clazz##View) \ + DEFINE_ADD_VALUE_F_CID(ExternalTypedData##clazz) \ + DEFINE_ADD_VALUE_F_CID(UnmodifiableTypedData##clazz##View) \ } CLASS_LIST_TYPED_DATA(DEFINE_ADD_MAP_KEY) #undef DEFINE_ADD_MAP_KEY #define DEFINE_ADD_MAP_KEY(clazz) \ - { \ - JSONArray internals(&map, #clazz); \ - DEFINE_ADD_VALUE_F_CID(Ffi##clazz) \ + {JSONArray internals(&map, #clazz); \ + DEFINE_ADD_VALUE_F_CID(Ffi##clazz) \ } CLASS_LIST_FFI(DEFINE_ADD_MAP_KEY) #undef DEFINE_ADD_MAP_KEY diff --git a/runtime/vm/service_isolate.h b/runtime/vm/service_isolate.h index d4236e1fcf2..fd616fd429e 100644 --- a/runtime/vm/service_isolate.h +++ b/runtime/vm/service_isolate.h @@ -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_; diff --git a/runtime/vm/simulator_arm.cc b/runtime/vm/simulator_arm.cc index adc7a00d6ad..3bcbea6fb19 100644 --- a/runtime/vm/simulator_arm.cc +++ b/runtime/vm/simulator_arm.cc @@ -358,11 +358,10 @@ void SimulatorDebugger::PrintBacktrace() { } else { OS::PrintErr("pc=0x%" Px " fp=0x%" Px " sp=0x%" Px " %s frame", frame->pc(), frame->fp(), frame->sp(), - frame->IsEntryFrame() - ? "entry" - : frame->IsExitFrame() - ? "exit" - : frame->IsStubFrame() ? "stub" : "invalid"); + frame->IsEntryFrame() ? "entry" + : frame->IsExitFrame() ? "exit" + : frame->IsStubFrame() ? "stub" + : "invalid"); #if defined(DART_PRECOMPILED_RUNTIME) intptr_t offset; auto const symbol_name = ImageName(vm_instructions, isolate_instructions, @@ -1441,7 +1440,7 @@ void Simulator::SupervisorCall(Instr* instr) { reinterpret_cast(external); r0 = InvokeLeafRuntime(target, r0, r1, r2, r3, r4); ClobberVolatileRegisters(); - set_register(R0, r0); // Set returned result from function. + set_register(R0, r0); // Set returned result from function. } else if (redirection->call_kind() == kLeafFloatRuntimeCall) { ASSERT((0 <= redirection->argument_count()) && (redirection->argument_count() <= 2)); @@ -3587,14 +3586,14 @@ int64_t Simulator::Call(int32_t entry, double d14_val = 0.0; double d15_val = 0.0; - d8_val = get_dregister(D8); - d9_val = get_dregister(D9); - d10_val = get_dregister(D10); - d11_val = get_dregister(D11); - d12_val = get_dregister(D12); - d13_val = get_dregister(D13); - d14_val = get_dregister(D14); - d15_val = get_dregister(D15); + d8_val = get_dregister(D8); + d9_val = get_dregister(D9); + d10_val = get_dregister(D10); + d11_val = get_dregister(D11); + d12_val = get_dregister(D12); + d13_val = get_dregister(D13); + d14_val = get_dregister(D14); + d15_val = get_dregister(D15); // Setup the callee-saved registers with a known value. To be able to check // that they are preserved properly across dart execution. @@ -3611,15 +3610,15 @@ int64_t Simulator::Call(int32_t entry, set_register(R11, callee_saved_value); double callee_saved_dvalue = 0.0; - callee_saved_dvalue = static_cast(icount_); - set_dregister(D8, callee_saved_dvalue); - set_dregister(D9, callee_saved_dvalue); - set_dregister(D10, callee_saved_dvalue); - set_dregister(D11, callee_saved_dvalue); - set_dregister(D12, callee_saved_dvalue); - set_dregister(D13, callee_saved_dvalue); - set_dregister(D14, callee_saved_dvalue); - set_dregister(D15, callee_saved_dvalue); + callee_saved_dvalue = static_cast(icount_); + set_dregister(D8, callee_saved_dvalue); + set_dregister(D9, callee_saved_dvalue); + set_dregister(D10, callee_saved_dvalue); + set_dregister(D11, callee_saved_dvalue); + set_dregister(D12, callee_saved_dvalue); + set_dregister(D13, callee_saved_dvalue); + set_dregister(D14, callee_saved_dvalue); + set_dregister(D15, callee_saved_dvalue); // Start the simulation Execute(); @@ -3636,14 +3635,14 @@ int64_t Simulator::Call(int32_t entry, ASSERT(callee_saved_value == get_register(R10)); ASSERT(callee_saved_value == get_register(R11)); - ASSERT(callee_saved_dvalue == get_dregister(D8)); - ASSERT(callee_saved_dvalue == get_dregister(D9)); - ASSERT(callee_saved_dvalue == get_dregister(D10)); - ASSERT(callee_saved_dvalue == get_dregister(D11)); - ASSERT(callee_saved_dvalue == get_dregister(D12)); - ASSERT(callee_saved_dvalue == get_dregister(D13)); - ASSERT(callee_saved_dvalue == get_dregister(D14)); - ASSERT(callee_saved_dvalue == get_dregister(D15)); + ASSERT(callee_saved_dvalue == get_dregister(D8)); + ASSERT(callee_saved_dvalue == get_dregister(D9)); + ASSERT(callee_saved_dvalue == get_dregister(D10)); + ASSERT(callee_saved_dvalue == get_dregister(D11)); + ASSERT(callee_saved_dvalue == get_dregister(D12)); + ASSERT(callee_saved_dvalue == get_dregister(D13)); + ASSERT(callee_saved_dvalue == get_dregister(D14)); + ASSERT(callee_saved_dvalue == get_dregister(D15)); // Restore callee-saved registers with the original value. set_register(R4, r4_val); @@ -3657,14 +3656,14 @@ int64_t Simulator::Call(int32_t entry, set_register(R10, r10_val); set_register(R11, r11_val); - set_dregister(D8, d8_val); - set_dregister(D9, d9_val); - set_dregister(D10, d10_val); - set_dregister(D11, d11_val); - set_dregister(D12, d12_val); - set_dregister(D13, d13_val); - set_dregister(D14, d14_val); - set_dregister(D15, d15_val); + set_dregister(D8, d8_val); + set_dregister(D9, d9_val); + set_dregister(D10, d10_val); + set_dregister(D11, d11_val); + set_dregister(D12, d12_val); + set_dregister(D13, d13_val); + set_dregister(D14, d14_val); + set_dregister(D15, d15_val); // Restore the SP register and return R1:R0. set_register(SP, sp_before_call); diff --git a/runtime/vm/simulator_arm64.cc b/runtime/vm/simulator_arm64.cc index 7ab63e8ea1e..f1473aa3aa1 100644 --- a/runtime/vm/simulator_arm64.cc +++ b/runtime/vm/simulator_arm64.cc @@ -385,11 +385,10 @@ void SimulatorDebugger::PrintBacktrace() { } else { OS::PrintErr("pc=0x%" Px " fp=0x%" Px " sp=0x%" Px " %s frame", frame->pc(), frame->fp(), frame->sp(), - frame->IsEntryFrame() - ? "entry" - : frame->IsExitFrame() - ? "exit" - : frame->IsStubFrame() ? "stub" : "invalid"); + frame->IsEntryFrame() ? "entry" + : frame->IsExitFrame() ? "exit" + : frame->IsStubFrame() ? "stub" + : "invalid"); #if defined(DART_PRECOMPILED_RUNTIME) intptr_t offset; auto const symbol_name = ImageName(vm_instructions, isolate_instructions, @@ -1720,7 +1719,7 @@ void Simulator::DoRedirectedCall(Instr* instr) { const int64_t res = InvokeLeafRuntime(target, r0, r1, r2, r3, r4, r5, r6, r7); ClobberVolatileRegisters(); - set_register(instr, R0, res); // Set returned result from function. + set_register(instr, R0, res); // Set returned result from function. } else if (redirection->call_kind() == kLeafFloatRuntimeCall) { ASSERT((0 <= redirection->argument_count()) && (redirection->argument_count() <= 8)); diff --git a/runtime/vm/symbols.cc b/runtime/vm/symbols.cc index 9e2f00a429e..24acd39210e 100644 --- a/runtime/vm/symbols.cc +++ b/runtime/vm/symbols.cc @@ -63,7 +63,6 @@ StringPtr ConcatString::ToSymbol() const { return result.ptr(); } - const char* Symbols::Name(SymbolId symbol) { ASSERT((symbol > kIllegal) && (symbol < kNullCharId)); return names[symbol]; diff --git a/runtime/vm/thread.h b/runtime/vm/thread.h index 1fe4d829a6d..56e6f4b55f6 100644 --- a/runtime/vm/thread.h +++ b/runtime/vm/thread.h @@ -459,7 +459,6 @@ class Thread : public ThreadState { return OFFSET_OF(Thread, safepoint_state_); } - // Tag state is maintained on transitions. enum { // Always true in generated state. diff --git a/runtime/vm/thread_stack_resource.h b/runtime/vm/thread_stack_resource.h index 8a4b6690c4f..6c316806d1a 100644 --- a/runtime/vm/thread_stack_resource.h +++ b/runtime/vm/thread_stack_resource.h @@ -36,7 +36,7 @@ template class AsThreadStackResource : public ThreadStackResource { public: static_assert(!std::is_base_of::value); - AsThreadStackResource(Thread* thread, Args&&... args) + explicit AsThreadStackResource(Thread* thread, Args&&... args) : ThreadStackResource(thread), member_(thread, std::forward(args)...) {} ~AsThreadStackResource() {} diff --git a/runtime/vm/thread_state.h b/runtime/vm/thread_state.h index f3a3d3fcba2..5ba476f4827 100644 --- a/runtime/vm/thread_state.h +++ b/runtime/vm/thread_state.h @@ -24,9 +24,7 @@ class Zone; class ThreadState : public BaseThread { public: // The currently executing thread, or nullptr if not yet initialized. - static ThreadState* Current() { - return OSThread::CurrentVMThread(); - } + static ThreadState* Current() { return OSThread::CurrentVMThread(); } explicit ThreadState(bool is_os_thread); virtual ~ThreadState(); diff --git a/runtime/vm/thread_test.cc b/runtime/vm/thread_test.cc index b3fd08f5d81..17f873ebad3 100644 --- a/runtime/vm/thread_test.cc +++ b/runtime/vm/thread_test.cc @@ -440,7 +440,7 @@ class ICDataTestTask : public ThreadPool::Task { const Array& ic_datas_; const intptr_t len_; Monitor* monitor_; - intptr_t* exited_; // # tasks that are no longer running. + intptr_t* exited_; // # tasks that are no longer running. std::atomic* done_; // Signal that helper threads can stop working. }; diff --git a/runtime/vm/timeline.cc b/runtime/vm/timeline.cc index 02855e2622b..9bc89fa12ab 100644 --- a/runtime/vm/timeline.cc +++ b/runtime/vm/timeline.cc @@ -570,9 +570,7 @@ void TimelineEvent::Duration(const char* label, set_timestamp1_or_id(end_micros); } -void TimelineEvent::Begin(const char* label, - int64_t id, - int64_t micros) { +void TimelineEvent::Begin(const char* label, int64_t id, int64_t micros) { Init(kBegin, label); set_timestamp0(micros); // Overload timestamp1_ with the event ID. This is required for the MacOS @@ -1533,23 +1531,23 @@ void TimelineEventRecorder::AddTrackMetadataBasedOnThread( // cases. return; } - MutexLocker ml(&track_uuid_to_track_metadata_lock_); + MutexLocker ml(&track_uuid_to_track_metadata_lock_); - void* key = reinterpret_cast(trace_id); - const intptr_t hash = Utils::WordHash(trace_id); - SimpleHashMap::Entry* entry = - track_uuid_to_track_metadata_.Lookup(key, hash, true); - if (entry->value == nullptr) { - entry->value = new TimelineTrackMetadata( - process_id, trace_id, - Utils::CreateCStringUniquePtr( - Utils::StrDup(thread_name == nullptr ? "" : thread_name))); - } else { - TimelineTrackMetadata* value = - static_cast(entry->value); - ASSERT(process_id == value->pid()); - value->set_track_name(Utils::CreateCStringUniquePtr( - Utils::StrDup(thread_name == nullptr ? "" : thread_name))); + void* key = reinterpret_cast(trace_id); + const intptr_t hash = Utils::WordHash(trace_id); + SimpleHashMap::Entry* entry = + track_uuid_to_track_metadata_.Lookup(key, hash, true); + if (entry->value == nullptr) { + entry->value = new TimelineTrackMetadata( + process_id, trace_id, + Utils::CreateCStringUniquePtr( + Utils::StrDup(thread_name == nullptr ? "" : thread_name))); + } else { + TimelineTrackMetadata* value = + static_cast(entry->value); + ASSERT(process_id == value->pid()); + value->set_track_name(Utils::CreateCStringUniquePtr( + Utils::StrDup(thread_name == nullptr ? "" : thread_name))); } } @@ -1561,10 +1559,10 @@ void TimelineEventRecorder::AddAsyncTrackMetadataBasedOnEvent( strcmp("callback", FLAG_timeline_recorder) == 0 || strcmp("systrace", FLAG_timeline_recorder) == 0 || FLAG_systrace_timeline) { - // There is no way to retrieve track metadata when a no-op, callback, or - // systrace recorder is in use, so we don't need to update the map in - // these cases. - return; + // There is no way to retrieve track metadata when a no-op, callback, or + // systrace recorder is in use, so we don't need to update the map in + // these cases. + return; } MutexLocker ml(&async_track_uuid_to_track_metadata_lock_); diff --git a/runtime/vm/timeline.h b/runtime/vm/timeline.h index 51329aa632c..d62c39ebc2f 100644 --- a/runtime/vm/timeline.h +++ b/runtime/vm/timeline.h @@ -547,12 +547,8 @@ class TimelineEvent { return PreSerializedArgsBit::decode(state_); } - TimelineEvent* next() const { - return next_; - } - void set_next(TimelineEvent* next) { - next_ = next; - } + TimelineEvent* next() const { return next_; } + void set_next(TimelineEvent* next) { next_ = next; } private: void StreamInit(TimelineStream* stream) { stream_ = stream; } @@ -1087,9 +1083,7 @@ class TimelineEventCallbackRecorder : public TimelineEventRecorder { virtual void OnEvent(TimelineEvent* event) = 0; const char* name() const { return CALLBACK_RECORDER_NAME; } - intptr_t Size() { - return 0; - } + intptr_t Size() { return 0; } protected: TimelineEventBlock* GetNewBlockLocked() { UNREACHABLE(); } diff --git a/runtime/vm/timeline_fuchsia.cc b/runtime/vm/timeline_fuchsia.cc index 09fdf0e8252..9a53fd680d5 100644 --- a/runtime/vm/timeline_fuchsia.cc +++ b/runtime/vm/timeline_fuchsia.cc @@ -30,13 +30,13 @@ void TimelineEventFuchsiaRecorder::OnEvent(TimelineEvent* event) { if (event->owns_label()) { // If the event owns the name, then the name will be deallocated, so // instruct the system trace to make a copy. - name = trace_context_make_registered_string_copy( - context, event->label(), strlen(event->label())); + name = trace_context_make_registered_string_copy(context, event->label(), + strlen(event->label())); } else { // If the event doesn't own the name, then it is a string literal, and // the system trace can use the pointer and not a copy. - name = trace_context_make_registered_string_literal( - context, event->label()); + name = + trace_context_make_registered_string_literal(context, event->label()); } trace_thread_ref_t thread; diff --git a/runtime/vm/timer.h b/runtime/vm/timer.h index fcf51587258..bd9bc660095 100644 --- a/runtime/vm/timer.h +++ b/runtime/vm/timer.h @@ -88,9 +88,7 @@ class TimerImpl : public ValueObject { explicit TimerImpl(int64_t elapsed) : total_(elapsed), max_contiguous_(elapsed) {} - int64_t ElapsedMicros() const { - return stop_ - start_; - } + int64_t ElapsedMicros() const { return stop_ - start_; } RelaxedAtomic start_; RelaxedAtomic stop_; diff --git a/runtime/vm/type_testing_stubs_test.cc b/runtime/vm/type_testing_stubs_test.cc index 843cdffe3e6..6cd194a480f 100644 --- a/runtime/vm/type_testing_stubs_test.cc +++ b/runtime/vm/type_testing_stubs_test.cc @@ -1929,7 +1929,7 @@ ISOLATE_UNIT_TEST_CASE(TTS_Object) { // so its TTS specializes the first time it is invoked. const bool should_specialize = true; auto make_test_case = [&](const Instance& instance) -> TTSTestCase { - return {instance, tav_null, tav_null}; + return {instance, tav_null, tav_null}; }; // Test on some easy-to-make instances. diff --git a/runtime/vm/unwinding_records.cc b/runtime/vm/unwinding_records.cc index 9ef2451a2be..13109d60d58 100644 --- a/runtime/vm/unwinding_records.cc +++ b/runtime/vm/unwinding_records.cc @@ -26,4 +26,3 @@ void UnwindingRecords::UnregisterExecutablePage(Page* page) {} #endif } // namespace dart - diff --git a/runtime/vm/v8_snapshot_writer.h b/runtime/vm/v8_snapshot_writer.h index 6cd20bc9512..405109b98e4 100644 --- a/runtime/vm/v8_snapshot_writer.h +++ b/runtime/vm/v8_snapshot_writer.h @@ -233,7 +233,7 @@ class V8SnapshotProfileWriter : public ZoneAllocated { intptr_t type = kInvalidString, intptr_t name = kInvalidString) : id(id), - edges(new (profile_writer->zone_) EdgeMap(profile_writer->zone_)), + edges(new(profile_writer->zone_) EdgeMap(profile_writer->zone_)), type(type), name(name) {} diff --git a/runtime/vm/zone.h b/runtime/vm/zone.h index ba18349cd3c..60003764301 100644 --- a/runtime/vm/zone.h +++ b/runtime/vm/zone.h @@ -205,18 +205,12 @@ class StackZone : public StackResource { #else // Compute the total size of this zone. This includes wasted space that is // due to internal fragmentation in the segments. - uintptr_t SizeInBytes() const { - return zone_.SizeInBytes(); - } + uintptr_t SizeInBytes() const { return zone_.SizeInBytes(); } // Computes the used space in the zone. - intptr_t CapacityInBytes() const { - return zone_.CapacityInBytes(); - } + intptr_t CapacityInBytes() const { return zone_.CapacityInBytes(); } - Zone* GetZone() { - return &zone_; - } + Zone* GetZone() { return &zone_; } #endif // defined(DART_USE_ABSL) private: