Fix OpenModelica#13951

Author: perost

OMCompiler/Compiler/FrontEndCpp/Class.cpp

@@ -17,8 +17,6 @@ constexpr int TYPED_DERIVED = 7;
 constexpr int DAE_TYPE = 8;
 
 extern record_description NFModifier_Modifier_NOMOD__desc;
-const MetaModelica::Record emptyMod(2, NFModifier_Modifier_NOMOD__desc, {});
-
 extern record_description NFClass_Prefixes_PREFIXES__desc;
 
 std::unique_ptr<Class> Class::fromAbsyn(const Absyn::Class &cls, InstNode *scope)
@@ -59,6 +57,8 @@ PartialClass::PartialClass(const Absyn::ClassParts &definition, bool isClassExte
 
 MetaModelica::Value PartialClass::toMetaModelica() const
 {
+  static const MetaModelica::Record emptyMod(2, NFModifier_Modifier_NOMOD__desc, {});
+
   return MetaModelica::Record(PARTIAL_CLASS, NFClass_PARTIAL__CLASS__desc, {
     _elements.toNF(),
     emptyMod,

OMCompiler/Compiler/FrontEndCpp/ClassNode.cpp

@@ -7,7 +7,6 @@ using namespace OpenModelica;
 extern record_description NFInstNode_InstNode_CLASS__NODE__desc;
 
 extern record_description NFClass_NOT__INSTANTIATED__desc;
-const MetaModelica::Value noClass = MetaModelica::Record(0, NFClass_NOT__INSTANTIATED__desc);
 
 constexpr int NAME_INDEX = 0;
 constexpr int DEFINITION_INDEX = 1;
@@ -18,7 +17,6 @@ constexpr int PARENT_SCOPE_INDEX = 5;
 constexpr int NODE_TYPE_INDEX = 6;
 
 extern record_description NFInstNode_CachedData_NO__CACHE__desc;
-const MetaModelica::Value noCache = MetaModelica::Record(0, NFInstNode_CachedData_NO__CACHE__desc);
 
 ClassNode::ClassNode(Absyn::Class *cls, InstNode *parent)
   : ClassNode(cls, parent, std::make_unique<NormalClassType>())
@@ -68,6 +66,9 @@ void ClassNode::instantiate()
 
 MetaModelica::Value ClassNode::toMetaModelica() const
 {
+  static const MetaModelica::Value noClass = MetaModelica::Record(0, NFClass_NOT__INSTANTIATED__desc);
+  static const MetaModelica::Value noCache = MetaModelica::Record(0, NFInstNode_CachedData_NO__CACHE__desc);
+
   // Nodes need to be cached to deal with the cyclical dependencies between nodes.
   if (!_mmCache) {
     auto cls_ptr = MetaModelica::Pointer();

OMCompiler/Compiler/FrontEndCpp/Component.cpp

@@ -20,7 +20,6 @@ constexpr int INVALID_COMPONENT = 5;
 constexpr int WILD = 6;
 
 extern record_description NFModifier_Modifier_NOMOD__desc;
-const MetaModelica::Record emptyMod(2, NFModifier_Modifier_NOMOD__desc, {});
 
 Component::Component(Absyn::Component *definition)
   : _definition{definition}
@@ -36,6 +35,8 @@ ComponentDef::ComponentDef(Absyn::Component *definition)
 
 MetaModelica::Value ComponentDef::toNF() const noexcept
 {
+  static const MetaModelica::Record emptyMod(2, NFModifier_Modifier_NOMOD__desc, {});
+
   return MetaModelica::Record{COMPONENT_DEF, NFComponent_COMPONENT__DEF__desc, {
     _definition->toSCode(),
     emptyMod