Fix Regression with GetCLRObject impacting Node Preview and Tessellation (#13363)

saintentropy · web-flow · commit f50c788f9886 · 2022-09-30T19:15:29.000-04:00
* RevertCode

* Remove clear function

Co-authored-by: Craig Long &lt;craig.long@autodesk.com&gt;
diff --git a/src/Engine/ProtoCore/Reflection/GraphicDataProvider.cs b/src/Engine/ProtoCore/Reflection/GraphicDataProvider.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
@@ -141,50 +141,31 @@ internal List<IGraphicItem> GetGraphicItems(DSASM.StackValue svData, RuntimeCore
             return null;
         }
 
-        //Store marshaller for repeated calls to GetCLRObject.  Used for short-circuit of re-allocation of marshaller / interpreter object.
-        private static Interpreter interpreter;
-        private static ProtoFFI.FFIObjectMarshaler marshaler;
-        
         internal object GetCLRObject(StackValue svData, RuntimeCore runtimeCore)
         {
             if (null == runtimeCore.DSExecutable.classTable)
                 return null;
 
-            //The GetCLRObject function is typically utilized to retrieve a ClrObject from a StackValue of type pointer.
-            //There is an edge cases for pointers where the pointer references a non CLR object.  This code
-            //checks for this edge case by verifying that the requested StackValue pointer is associated with an
-            //imported library.  An example is the "Function" pointer which does not have an associated CLRObject.
-            //In that case, the return value should be null.
-            var classNode = runtimeCore.DSExecutable.classTable.GetClassNodeAtIndex(svData.metaData.type);
-            if (classNode != null  && !classNode.IsImportedClass)
-            {
+            IList<ClassNode> classNodes = runtimeCore.DSExecutable.classTable.ClassNodes;
+            if (null == classNodes || (classNodes.Count <= 0))
                 return null;
-            }
 
-            if (marshaler != null)
-            {
-                return marshaler.UnMarshal(svData, null, interpreter, typeof(object));
-            }
+            ClassNode classnode = runtimeCore.DSExecutable.classTable.ClassNodes[svData.metaData.type];
+            if (!classnode.IsImportedClass) //TODO: look at properties to see if it contains any FFI objects.
+                return null;
 
             try
             {
-                interpreter = new ProtoCore.DSASM.Interpreter(runtimeCore, false);
+                ProtoCore.DSASM.Interpreter interpreter = new ProtoCore.DSASM.Interpreter(runtimeCore, false);
                 var helper = ProtoFFI.DLLFFIHandler.GetModuleHelper(ProtoFFI.FFILanguage.CSharp);
-                marshaler = helper.GetMarshaler(runtimeCore);
+                var marshaler = helper.GetMarshaler(runtimeCore);
                 return marshaler.UnMarshal(svData, null, interpreter, typeof(object));
             }
             catch (System.Exception)
             {
-                marshaler = null;
                 return null;
             }
         }
-
-        internal static void ClearMarshaller()
-        {
-            interpreter = null;
-            marshaler = null;
-        }
     }
 
     /// <summary>
diff --git a/src/Engine/ProtoCore/RuntimeCore.cs b/src/Engine/ProtoCore/RuntimeCore.cs
@@ -6,7 +6,6 @@
 using ProtoCore.DSASM;
 using ProtoCore.Lang;
 using ProtoCore.Lang.Replication;
-using ProtoCore.Mirror;
 using ProtoCore.Runtime;
 using ProtoCore.Utils;
 using ProtoFFI;
@@ -272,7 +271,6 @@ public void Cleanup()
         {
             OnDispose();
             CLRModuleType.ClearTypes();
-            GraphicDataProvider.ClearMarshaller();
         }
 
         public void NotifyExecutionEvent(ExecutionStateEventArgs.State state)

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`using ProtoCore.DSASM;`
`7`	`7`	`using ProtoCore.Lang;`
`8`	`8`	`using ProtoCore.Lang.Replication;`
`9`		`-using ProtoCore.Mirror;`
`10`	`9`	`using ProtoCore.Runtime;`
`11`	`10`	`using ProtoCore.Utils;`
`12`	`11`	`using ProtoFFI;`
`@@ -272,7 +271,6 @@ public void Cleanup()`
`272`	`271`	`{`
`273`	`272`	`OnDispose();`
`274`	`273`	`CLRModuleType.ClearTypes();`
`275`		`- GraphicDataProvider.ClearMarshaller();`
`276`	`274`	`}`
`277`	`275`
`278`	`276`	`public void NotifyExecutionEvent(ExecutionStateEventArgs.State state)`