From 8f26a4fd1d37d79b49f793641fa621d4ca096293 Mon Sep 17 00:00:00 2001 From: Klimentieva Date: Mon, 21 Jul 2025 13:44:37 +0300 Subject: [PATCH 1/2] fix codecheck Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICNSUP Change-Id: I353f5d43dc86a574e9952f5a8ea58677acc95c8e Signed-off-by: Klimentieva --- ets2panda/checker/ets/utilityTypeHandlers.cpp | 1 + .../compiler/lowering/ets/genericBridgesLowering.cpp | 8 ++++---- ets2panda/ir/ets/etsTypeReference.cpp | 8 +++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ets2panda/checker/ets/utilityTypeHandlers.cpp b/ets2panda/checker/ets/utilityTypeHandlers.cpp index 1041ab4faf..d004320264 100644 --- a/ets2panda/checker/ets/utilityTypeHandlers.cpp +++ b/ets2panda/checker/ets/utilityTypeHandlers.cpp @@ -530,6 +530,7 @@ static void SetupFunctionParams(ir::ScriptFunction *function, varbinder::Functio checker->AllocNode(checker->Allocator())}, checker->Allocator()->Adapter()), checker->Allocator()); + ES2PANDA_ASSERT(unionType != nullptr); paramExpr->Ident()->SetTsTypeAnnotation(unionType); unionType->SetParent(paramExpr->Ident()); } diff --git a/ets2panda/compiler/lowering/ets/genericBridgesLowering.cpp b/ets2panda/compiler/lowering/ets/genericBridgesLowering.cpp index 0805641419..fed45f5633 100644 --- a/ets2panda/compiler/lowering/ets/genericBridgesLowering.cpp +++ b/ets2panda/compiler/lowering/ets/genericBridgesLowering.cpp @@ -83,10 +83,10 @@ void GenericBridgesPhase::AddGenericBridge(ir::ClassDefinition const *const clas typeNodes.reserve(2U * baseSignature->Params().size() + 2U); auto const sourceCode = CreateMethodDefinitionString(classDefinition, baseSignature, derivedFunction, typeNodes); - - auto *const bridgeMethod = - parser->CreateFormattedClassMethodDefinition(sourceCode, typeNodes)->AsMethodDefinition(); - ES2PANDA_ASSERT(bridgeMethod); + auto *const bridgeMethodDefinition = parser->CreateFormattedClassMethodDefinition(sourceCode, typeNodes); + ES2PANDA_ASSERT(bridgeMethodDefinition != nullptr); + auto *const bridgeMethod = bridgeMethodDefinition->AsMethodDefinition(); + ES2PANDA_ASSERT(bridgeMethod != nullptr && methodDefinition->Id() != nullptr); bridgeMethod->AddModifier(methodDefinition->Modifiers()); bridgeMethod->ClearModifier(ir::ModifierFlags::NATIVE | ir::ModifierFlags::ABSTRACT); bridgeMethod->AddAstNodeFlags(methodDefinition->GetAstNodeFlags()); diff --git a/ets2panda/ir/ets/etsTypeReference.cpp b/ets2panda/ir/ets/etsTypeReference.cpp index 21db7e1814..3365749830 100644 --- a/ets2panda/ir/ets/etsTypeReference.cpp +++ b/ets2panda/ir/ets/etsTypeReference.cpp @@ -112,8 +112,14 @@ checker::Type *ETSTypeReference::GetType(checker::ETSChecker *checker) ETSTypeReference *ETSTypeReference::Clone(ArenaAllocator *const allocator, AstNode *const parent) { - auto *const partClone = part_ != nullptr ? part_->Clone(allocator, nullptr)->AsETSTypeReferencePart() : nullptr; + ETSTypeReferencePart *partClone = nullptr; + if (part_ != nullptr) { + auto *const clone = part_->Clone(allocator, nullptr); + ES2PANDA_ASSERT(clone != nullptr); + partClone = clone->AsETSTypeReferencePart(); + } auto *const clone = allocator->New(partClone, allocator); + ES2PANDA_ASSERT(clone != nullptr); if (partClone != nullptr) { partClone->SetParent(clone); -- Gitee From 825820a8c255a053b9ea5c08ff7f4b91a08e40d2 Mon Sep 17 00:00:00 2001 From: tsatsulya Date: Mon, 21 Jul 2025 17:34:35 +0300 Subject: [PATCH 2/2] Fix codecheck Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICNU4Y?from=project-issue Signed-off-by: tsatsulya --- ets2panda/ir/expressions/literals/nullLiteral.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ets2panda/ir/expressions/literals/nullLiteral.cpp b/ets2panda/ir/expressions/literals/nullLiteral.cpp index 740902912d..c8a703a824 100644 --- a/ets2panda/ir/expressions/literals/nullLiteral.cpp +++ b/ets2panda/ir/expressions/literals/nullLiteral.cpp @@ -60,6 +60,7 @@ checker::VerifiedType NullLiteral::Check(checker::ETSChecker *checker) NullLiteral *NullLiteral::Clone(ArenaAllocator *const allocator, AstNode *const parent) { auto *const clone = allocator->New(); + ES2PANDA_ASSERT(clone != nullptr); if (parent != nullptr) { clone->SetParent(parent); } -- Gitee