Do not expand slices in NF if targeting CPP runtime. (#8356)

- This is not desired for the CPP runtime for now.
OpenModelica · Dec 22, 2021 · 8713a81 · 8713a81
1 parent 3e19760
commit 8713a81
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFInst.mo b/OMCompiler/Compiler/NFFrontEnd/NFInst.mo
@@ -64,6 +64,7 @@ import Algorithm = NFAlgorithm;
 import InstContext = NFInstContext;
 
 protected
+import Config;
 import Array;
 import Error;
 import FlagsUtil;
@@ -206,7 +207,11 @@ algorithm
   InstUtil.dumpFlatModelDebug("scalarize", flatModel, functions);
 
   VerifyModel.verify(flatModel);
-  (flatModel, functions) := InstUtil.expandSlicedCrefs(flatModel, functions);
+
+  if not Config.simCodeTarget() == "Cpp" and not Config.simCodeTarget() == "omsicpp" then
+    (flatModel, functions) := InstUtil.expandSlicedCrefs(flatModel, functions);
+  end if;
+
   flatModel := InstUtil.combineSubscripts(flatModel);
 
   //(var_count, eq_count) := CheckModel.checkModel(flatModel);