Make code for this type resolution clearer

seiya0701 · May 9, 2021 · 6a1082b · 6a1082b
1 parent e9d4b80
commit 6a1082b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/Pose/IL/MethodRewriter.cs b/src/Pose/IL/MethodRewriter.cs
@@ -38,8 +38,12 @@ public MethodBase Rewrite()
             List<Type> parameterTypes = new List<Type>();
             if (!m_method.IsStatic)
             {
-                Type thisType = m_owningType.IsValueType ? m_owningType.MakeByRefType() : m_owningType;
-                thisType = m_isInterfaceDispatch ? typeof(object) : thisType;
+                Type thisType = m_isInterfaceDispatch ? typeof(object) : m_owningType;
+                if (!m_isInterfaceDispatch && m_owningType.IsValueType)
+                {
+                    thisType = thisType.MakeByRefType();
+                }
+
                 parameterTypes.Add(thisType);
             }
 

diff --git a/src/Pose/IL/Stubs.cs b/src/Pose/IL/Stubs.cs
@@ -36,7 +36,12 @@ public static DynamicMethod GenerateStubForMethod(MethodInfo methodInfo)
             List<Type> signatureParamTypes = new List<Type>();
             if (!methodInfo.IsStatic)
             {
-                Type thisType = methodInfo.DeclaringType.IsValueType ? methodInfo.DeclaringType.MakeByRefType() : methodInfo.DeclaringType;
+                Type thisType = methodInfo.DeclaringType;
+                if (thisType.IsValueType)
+                {
+                    thisType = thisType.MakeByRefType();
+                }
+
                 signatureParamTypes.Add(thisType);
             }