Revert cref typing fix that doesn't quite work (#8421)

OpenModelica · Jan 14, 2022 · 0aa0fe7 · 0aa0fe7
1 parent 4196d44
commit 0aa0fe7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFType.mo b/OMCompiler/Compiler/NFFrontEnd/NFType.mo
@@ -695,7 +695,7 @@ public
       case ARRAY() then ty.dimensions;
       case FUNCTION() then arrayDims(Function.returnType(ty.fn));
       case METABOXED() then arrayDims(ty.ty);
-      //case CONDITIONAL_ARRAY() then List.fill(Dimension.UNKNOWN(), dimensionCount(ty.trueType));
+      case CONDITIONAL_ARRAY() then List.fill(Dimension.UNKNOWN(), dimensionCount(ty.trueType));
       else {};
     end match;
   end arrayDims;

diff --git a/OMCompiler/Compiler/NFFrontEnd/NFTyping.mo b/OMCompiler/Compiler/NFFrontEnd/NFTyping.mo
@@ -1815,7 +1815,7 @@ algorithm
         // component was declared, not where it's used. This can be different to
         // the given context, e.g. for package constants used in a function.
         parent_res := InstNode.restriction(InstNode.explicitParent(cref.node));
-        node_context := if Restriction.isFunction(parent_res) or Restriction.isRecord(parent_res) then
+        node_context := if Restriction.isFunction(parent_res) /*or Restriction.isRecord(parent_res)*/ then
           NFInstContext.FUNCTION else NFInstContext.CLASS;
         node_ty := typeComponent(cref.node, node_context);
 

diff --git a/testsuite/flattening/modelica/scodeinst/Makefile b/testsuite/flattening/modelica/scodeinst/Makefile
@@ -873,7 +873,6 @@ RecordBinding5.mo \
 RecordBinding6.mo \
 RecordBinding7.mo \
 RecordBinding8.mo \
-RecordBinding9.mo \
 RecordConstructor1.mo \
 RecordConstructor2.mo \
 RecordExtends1.mo \
@@ -1070,6 +1069,7 @@ sts.mos \
 # test that currently fail. Move up when fixed.
 # Run make testfailing
 FAILINGTESTFILES=\
+RecordBinding9.mo \
 CevalFuncRecord3.mo \
 CevalFuncRecord4.mo \
 FinalParameter1.mo \