Removed MemberFunction as an attribute.

Changed virtual_function to be cached as well.

Author: CookStar

Diff for: addons/source-python/packages/source-python/memory/manager.py

@@ -619,6 +619,8 @@ def virtual_function(
         if return_type not in DataType.values:
             return_type = self.create_converter(return_type)
 
+        funcs = {}
+
         class fget(object):
             def __set_name__(fget_self, owner, name):
                 fget_self.name = name
@@ -628,22 +630,26 @@ def __get__(fget_self, obj, cls=None):
                 if obj is None:
                     return fget_self
 
-                # Create the virtual function
-                func = obj.make_virtual_function(
-                    index,
-                    convention,
-                    args,
-                    return_type
-                )
+                # Get the vtable address
+                address = obj._ptr().get_pointer().address
+                # Search function cache by vtable address
+                func = funcs.get(address, None)
+
+                if func is None:
+                    # Create the virtual function cache it
+                    func = obj.make_virtual_function(
+                        index,
+                        convention,
+                        args,
+                        return_type
+                    )
+                    funcs[address] = func
 
                 # Wrap it using MemberFunction, so we don't have to pass the this
                 # pointer anymore
                 func = MemberFunction(self, return_type, func, obj)
                 func.__doc__ = doc
 
-                # Set the MemberFunction as an attribute to the instance.
-                setattr(obj, fget_self.name, func)
-
                 return func
 
         return fget()
@@ -696,9 +702,6 @@ def __get__(fget_self, obj, cls=None):
                     m_func = MemberFunction(self, return_type, func, obj)
                     m_func.__doc__ = doc
 
-                    # Set the MemberFunction as an attribute to the instance.
-                    setattr(obj, fget_self.name, m_func)
-
                     return m_func
 
                 return func