From 3a2cf7177cbb26f0bce9bf81f3040424e0df68d3 Mon Sep 17 00:00:00 2001 From: obdev Date: Fri, 6 Dec 2024 14:16:36 +0000 Subject: [PATCH] Disable stack-check of ASAN --- cmake/Env.cmake | 4 ++-- src/objit/src/ob_llvm_di_helper.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/Env.cmake b/cmake/Env.cmake index 0fe97deb8..c20abd803 100644 --- a/cmake/Env.cmake +++ b/cmake/Env.cmake @@ -264,11 +264,11 @@ if (OB_USE_CLANG) set(_CMAKE_TOOLCHAIN_LOCATION "${DEVTOOLS_DIR}/bin") if (OB_USE_ASAN) - ob_define(CMAKE_ASAN_FLAG "-fstack-protector-strong -fsanitize=address -fno-optimize-sibling-calls -fsanitize-blacklist=${ASAN_IGNORE_LIST}") + ob_define(CMAKE_ASAN_FLAG "-mllvm -asan-stack=0 -fsanitize=address -fno-optimize-sibling-calls -fsanitize-blacklist=${ASAN_IGNORE_LIST}") endif() if (OB_USE_LLD) - set(LD_OPT "-fuse-ld=${DEVTOOLS_DIR}/bin/ld.lld") + set(LD_OPT "-fuse-ld=${DEVTOOLS_DIR}/bin/ld.lld -Wno-unused-command-line-argument") set(REORDER_COMP_OPT "-ffunction-sections -fdebug-info-for-profiling") set(REORDER_LINK_OPT "-Wl,--no-rosegment,--build-id=sha1 ${HOTFUNC_OPT}") set(OB_LD_BIN "${DEVTOOLS_DIR}/bin/ld.lld") diff --git a/src/objit/src/ob_llvm_di_helper.cpp b/src/objit/src/ob_llvm_di_helper.cpp index 7209ae490..398eaf2cb 100644 --- a/src/objit/src/ob_llvm_di_helper.cpp +++ b/src/objit/src/ob_llvm_di_helper.cpp @@ -359,9 +359,9 @@ int ObLLVMDIHelper::create_array_type(ObLLVMDIType &base_type, int64_t count, if (OB_ISNULL(jc_)) { ret = OB_NOT_INIT; LOG_WARN("jc is NULL", K(ret)); - } else if (OB_ISNULL(subrange = jc_->dbuilder_.getOrCreateSubrange(0, count))) { - ret = OB_ERR_UNEXPECTED; - LOG_WARN("subrange is NULL", K(ret)); + } else if (OB_ISNULL(subrange = jc_->dbuilder_.getOrCreateSubrange(0, count))) { + ret = OB_ERR_UNEXPECTED; + LOG_WARN("subrange is NULL", K(ret)); } else if (OB_ISNULL(base_type.get_v())) { ret = OB_ERR_UNEXPECTED; LOG_WARN("base type is NULL", K(ret));