From 80c5da059caec093f8c0c8e612104a899720c743 Mon Sep 17 00:00:00 2001 From: zhouwenxuan Date: Tue, 15 Jul 2025 09:07:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue: [新需求]: 代码告警处理 https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/ICM974 Signed-off-by: zhouwenxuan Change-Id: Ia694a51571c4860167e88e39dfaadcaa2337abe5 --- common_components/base/c_string.cpp | 10 +++++----- common_components/base/c_string.h | 2 +- common_components/base_runtime/base_runtime.cpp | 1 - common_components/common/page_allocator.h | 1 - 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/common_components/base/c_string.cpp b/common_components/base/c_string.cpp index 64631c39ce..26115b6b56 100755 --- a/common_components/base/c_string.cpp +++ b/common_components/base/c_string.cpp @@ -199,11 +199,11 @@ CString& CString::Append(const CString& addStr, size_t addLen) addLen = strlen(addStr.str_); } EnsureSpace(addLen); - DCHECK_CC(addLen <= addStr.length_); + CHECK_CC(addLen <= addStr.length_); LOGF_IF(memcpy_s(str_ + length_, capacity_ - length_, addStr.str_, addLen) != EOK) << "CString::Append memcpy_s failed"; length_ += addLen; - DCHECK_CC(str_ != nullptr); + CHECK_CC(str_ != nullptr); str_[length_] = '\0'; return *this; } @@ -217,7 +217,7 @@ CString& CString::Append(const char* addStr, size_t addLen) addLen = strlen(addStr); } EnsureSpace(addLen); - DCHECK_CC(addLen <= strlen(addStr)); + CHECK_CC(addLen <= strlen(addStr)); LOGF_IF(memcpy_s(str_ + length_, capacity_ - length_, addStr, addLen) != EOK) << "CString::Append memcpy_s failed"; length_ += addLen; @@ -318,7 +318,7 @@ CString CString::SubStr(size_t index, size_t len) const return newStr; } newStr.length_ = len; - DCHECK_CC(newStr.str_ != nullptr); + CHECK_CC(newStr.str_ != nullptr); newStr.str_[newStr.length_] = '\0'; return newStr; } @@ -430,7 +430,7 @@ CString CString::RemoveBlankSpace() const if (length_ == 0) { return noBlankSpaceStr; } - DCHECK_CC(noBlankSpaceStr.str_ != nullptr); + CHECK_CC(noBlankSpaceStr.str_ != nullptr); for (size_t i = 0; i < length_; i++) { if (str_[i] != ' ') { noBlankSpaceStr.str_[index++] = str_[i]; diff --git a/common_components/base/c_string.h b/common_components/base/c_string.h index 959607a29b..dd0751cba8 100755 --- a/common_components/base/c_string.h +++ b/common_components/base/c_string.h @@ -88,7 +88,7 @@ public: bool operator==(const CString& other) const { - DCHECK_CC(other.str_ != nullptr); + CHECK_CC(other.str_ != nullptr); return strcmp(str_, other.str_) == 0; } diff --git a/common_components/base_runtime/base_runtime.cpp b/common_components/base_runtime/base_runtime.cpp index 677a06f353..a9d6053fb2 100755 --- a/common_components/base_runtime/base_runtime.cpp +++ b/common_components/base_runtime/base_runtime.cpp @@ -169,7 +169,6 @@ void BaseRuntime::WriteRoot(void *obj) void BaseRuntime::WriteBarrier(void* obj, void* field, void* ref) { - DCHECK_CC(field != nullptr); Heap::GetBarrier().WriteBarrier(reinterpret_cast(obj), *reinterpret_cast*>(field), reinterpret_cast(ref)); } diff --git a/common_components/common/page_allocator.h b/common_components/common/page_allocator.h index 8eb8f669b2..e339fe4756 100755 --- a/common_components/common/page_allocator.h +++ b/common_components/common/page_allocator.h @@ -132,7 +132,6 @@ public: // create page if nonFull_ is nullptr if (nonFull_ == nullptr) { Page* cur = CreatePage(); - DCHECK_CC(cur != nullptr); InitPage(*cur); ++totalPages_; nonFull_ = cur; -- Gitee