From abbf3e40b388f5bbda08eeb580c82b32b9039569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=96stlund?= <per.ostlund@liu.se>
Date: Thu, 15 Jun 2023 00:34:31 +0200
Subject: [PATCH] Partially revert #10820 (#10842)

- Temporarily disable inlining of normal functions when splitting record
  bindings, since it causes issues at the moment.
---
 OMCompiler/Compiler/NFFrontEnd/NFInline.mo    |  1 +
 .../flattening/modelica/scodeinst/Makefile    |  2 +-
 .../openmodelica/visualization/Surfaces.mos   | 60 +++++++++----------
 3 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/OMCompiler/Compiler/NFFrontEnd/NFInline.mo b/OMCompiler/Compiler/NFFrontEnd/NFInline.mo
index 45515e3b321..a326d4eb008 100644
--- a/OMCompiler/Compiler/NFFrontEnd/NFInline.mo
+++ b/OMCompiler/Compiler/NFFrontEnd/NFInline.mo
@@ -120,6 +120,7 @@ algorithm
     // Normal function
     case Call.TYPED_CALL(fn = fn as Function.FUNCTION(inputs = inputs, outputs = outputs, locals = locals),
                          arguments = args)
+      guard not forceInline
       algorithm
         body := Function.getBody(fn);
 
diff --git a/testsuite/flattening/modelica/scodeinst/Makefile b/testsuite/flattening/modelica/scodeinst/Makefile
index 5604688b962..57e1fba3a74 100644
--- a/testsuite/flattening/modelica/scodeinst/Makefile
+++ b/testsuite/flattening/modelica/scodeinst/Makefile
@@ -753,7 +753,6 @@ ImpureCall1.mo \
 Inline1.mo \
 Inline2.mo \
 Inline3.mo \
-Inline4.mo \
 InnerOuter1.mo \
 InnerOuter2.mo \
 InnerOuter3.mo \
@@ -1160,6 +1159,7 @@ sts.mos \
 # test that currently fail. Move up when fixed.
 # Run make testfailing
 FAILINGTESTFILES=\
+Inline4.mo \
 ProtectedMod4.mo \
 CevalFuncRecord3.mo \
 CevalFuncRecord4.mo \
diff --git a/testsuite/openmodelica/visualization/Surfaces.mos b/testsuite/openmodelica/visualization/Surfaces.mos
index 55b5dc377aa..b320a0dba06 100644
--- a/testsuite/openmodelica/visualization/Surfaces.mos
+++ b/testsuite/openmodelica/visualization/Surfaces.mos
@@ -649,36 +649,6 @@ getErrorString();
 //       <transparency><exp>0.0</exp></transparency>
 //   </surface>
 //   <surface>
-//       <ident>world.surface</ident>
-//       <T>
-//           <cref>world.surface.R.T[1,1]</cref>
-//           <cref>world.surface.R.T[1,2]</cref>
-//           <cref>world.surface.R.T[1,3]</cref>
-//           <cref>world.surface.R.T[2,1]</cref>
-//           <cref>world.surface.R.T[2,2]</cref>
-//           <cref>world.surface.R.T[2,3]</cref>
-//           <cref>world.surface.R.T[3,1]</cref>
-//           <cref>world.surface.R.T[3,2]</cref>
-//           <cref>world.surface.R.T[3,3]</cref>
-//       </T>
-//       <r>
-//           <exp>0.0</exp>
-//           <exp>0.0</exp>
-//           <exp>0.0</exp>
-//       </r>
-//       <nu><exp>2</exp></nu>
-//       <nv><exp>2</exp></nv>
-//       <wireframe><bconst>false</bconst></wireframe>
-//       <multiColored><bconst>false</bconst></multiColored>
-//       <color>
-//           <exp>215.0</exp>
-//           <exp>215.0</exp>
-//           <exp>215.0</exp>
-//       </color>
-//       <specCoeff><exp>0.0</exp></specCoeff>
-//       <transparency><exp>0.0</exp></transparency>
-//   </surface>
-//   <surface>
 //       <ident>surface</ident>
 //       <T>
 //           <exp>1.0</exp>
@@ -888,6 +858,36 @@ getErrorString();
 //       </color>
 //       <specCoeff><exp>0.0</exp></specCoeff>
 //   </shape>
+//   <surface>
+//       <ident>world.surface</ident>
+//       <T>
+//           <exp>1.0</exp>
+//           <exp>6.123233995736766e-17</exp>
+//           <exp>-6.123233995736766e-17</exp>
+//           <exp>6.123233995736766e-17</exp>
+//           <exp>-1.0</exp>
+//           <exp>0.0</exp>
+//           <exp>-6.123233995736766e-17</exp>
+//           <exp>-3.749399456654644e-33</exp>
+//           <exp>-1.0</exp>
+//       </T>
+//       <r>
+//           <exp>0.0</exp>
+//           <exp>0.0</exp>
+//           <exp>0.0</exp>
+//       </r>
+//       <nu><exp>2</exp></nu>
+//       <nv><exp>2</exp></nv>
+//       <wireframe><bconst>false</bconst></wireframe>
+//       <multiColored><bconst>false</bconst></multiColored>
+//       <color>
+//           <exp>215.0</exp>
+//           <exp>215.0</exp>
+//           <exp>215.0</exp>
+//       </color>
+//       <specCoeff><exp>0.0</exp></specCoeff>
+//       <transparency><exp>0.0</exp></transparency>
+//   </surface>
 // </visualization>"
 // ""
 // endResult