diff --git a/ets2panda/compiler/lowering/ets/constantExpressionLowering.cpp b/ets2panda/compiler/lowering/ets/constantExpressionLowering.cpp index 696f48babd22bb5cc663c0fcc299719b579eec63..fefcdb29f33153e18df311d320b03d07e01e0e5b 100644 --- a/ets2panda/compiler/lowering/ets/constantExpressionLowering.cpp +++ b/ets2panda/compiler/lowering/ets/constantExpressionLowering.cpp @@ -1332,7 +1332,7 @@ ir::AstNode *ConstantExpressionLowering::MaybeUnfoldIdentifier(ir::Identifier *n } auto *resolved = ResolveIdentifier(node); - if (resolved == nullptr || !resolved->Declaration()->IsConstDecl()) { + if (resolved == nullptr || !(resolved->Declaration()->IsConstDecl() || resolved->Declaration()->IsReadonlyDecl())) { return node; } return UnfoldResolvedReference(resolved->Declaration()->Node(), node); diff --git a/ets2panda/compiler/lowering/scopesInit/scopesInitPhase.cpp b/ets2panda/compiler/lowering/scopesInit/scopesInitPhase.cpp index b0c239c3819bc522fa4f8e4baa61f553cc977afe..5ff66ce135c12fb7eaba3508e33e0274ec8641e1 100644 --- a/ets2panda/compiler/lowering/scopesInit/scopesInitPhase.cpp +++ b/ets2panda/compiler/lowering/scopesInit/scopesInitPhase.cpp @@ -1077,7 +1077,7 @@ void InitScopesPhaseETS::VisitTSEnumMember(ir::TSEnumMember *enumMember) if (var = VarBinder()->GetScope()->FindLocal(name, varbinder::ResolveBindingOptions::STATIC_VARIABLES); var == nullptr) { varbinder::Decl *decl = nullptr; - std::tie(decl, var) = VarBinder()->NewVarDecl(ident->Start(), name); + std::tie(decl, var) = VarBinder()->NewVarDecl(ident->Start(), name); var->SetScope(VarBinder()->GetScope()); var->AddFlag(varbinder::VariableFlags::STATIC); decl->BindNode(enumMember); diff --git a/ets2panda/test/test-lists/ets-runtime/ets-runtime-ignored.txt b/ets2panda/test/test-lists/ets-runtime/ets-runtime-ignored.txt index 37713ee60a04678e72ac68188e057a369849ba2f..777a0c383014c704aac3eae858d504719efdfba6 100644 --- a/ets2panda/test/test-lists/ets-runtime/ets-runtime-ignored.txt +++ b/ets2panda/test/test-lists/ets-runtime/ets-runtime-ignored.txt @@ -103,9 +103,6 @@ type_from_primitive_type.ets # Rebase no-primitives pathch onto master with merger Array refactoring union_generic_class.ets -# No-primitives #24986 [start] -enum-initialize-with-itself.ets - # New failures at #FailKind.VERIFIER_FAIL inferTypeLambda_14.ets @@ -117,4 +114,4 @@ overload-primitive-and-object.ets lambda_with_restparameter_optinal_fixedarray.ets finallyTryAbruptedByReturn.ets -# No-primitives #24986 [end] \ No newline at end of file +# No-primitives #24986 [end]