Lib: Fix field offsets on wasm. Closes SamboyCoding#226

ds5678 · Jul 18, 2023 · 4e8264a · 4e8264a
1 parent 812b3bb
commit 4e8264a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/LibCpp2IL/ClassReadingBinaryReader.cs b/LibCpp2IL/ClassReadingBinaryReader.cs
@@ -87,8 +87,6 @@ public long Position
             return null;
         }
 
-        private Dictionary<FieldInfo, bool> _cachedNoSerialize = new();
-
         public uint ReadUnityCompressedUIntAtRawAddr(long offset, out int bytesRead)
         {
             GetLockOrThrow();

diff --git a/LibCpp2IL/Il2CppBinary.cs b/LibCpp2IL/Il2CppBinary.cs
@@ -389,7 +389,7 @@ public int GetFieldOffsetFromIndex(int typeIndex, int fieldIndexInType, int fiel
                     {
                         var offsetOffset = (ulong)MapVirtualAddressToRaw(ptr) + 4ul * (ulong)fieldIndexInType;
                         Position = (long)offsetOffset;
-                        offset = ReadInt32();
+                        offset = (int)ReadPrimitive(typeof(int))!; //Read 4 bytes. We can't just use ReadInt32 because that breaks e.g. Wasm. Hoping the JIT can optimize this as it knows the type.
                     }
                 }
                 else