[NF] Reuse pointer when redeclaring component.

Belonging to [master]: - OpenModelica/OMCompiler#2967 - OpenModelica/OpenModelica-testsuite#1133
OpenModelica · Mar 6, 2019 · a0d3cc1 · a0d3cc1
1 parent 1cc697e
commit a0d3cc1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/Compiler/NFFrontEnd/NFInst.mo b/Compiler/NFFrontEnd/NFInst.mo
@@ -1480,10 +1480,12 @@ algorithm
     fail();
   end if;
 
+  orig_comp := InstNode.component(originalNode);
   rdcl_type := InstNodeType.REDECLARED_COMP(InstNode.parent(originalNode));
   rdcl_node := InstNode.setNodeType(rdcl_type, redeclareNode);
+  rdcl_node := InstNode.copyInstancePtr(originalNode, rdcl_node);
+  rdcl_node := InstNode.updateComponent(InstNode.component(redeclareNode), rdcl_node);
   instComponent(rdcl_node, outerAttr, constrainingMod, true);
-  orig_comp := InstNode.component(originalNode);
   rdcl_comp := InstNode.component(rdcl_node);
 
   new_comp := match (orig_comp, rdcl_comp)

diff --git a/Compiler/NFFrontEnd/NFInstNode.mo b/Compiler/NFFrontEnd/NFInstNode.mo
@@ -1552,6 +1552,26 @@ uniontype InstNode
       else accumCmts;
     end match;
   end getComments;
+
+  function copyInstancePtr
+    input InstNode srcNode;
+    input output InstNode dstNode;
+  algorithm
+    () := match (srcNode, dstNode)
+      case (COMPONENT_NODE(), COMPONENT_NODE())
+        algorithm
+          dstNode.component := srcNode.component;
+        then
+          ();
+
+      case (CLASS_NODE(), CLASS_NODE())
+        algorithm
+          dstNode.cls := srcNode.cls;
+        then
+          ();
+
+    end match;
+  end copyInstancePtr;
 end InstNode;
 
 annotation(__OpenModelica_Interface="frontend");