remove AggressiveInline attribute

darrenkopp · darrenkopp · commit e3e5ed3d53b9 · 2013-06-30T12:26:06.000-06:00
Can't inline virtual methods, so remove where pointless
diff --git a/MurmurHash/Managed/Murmur128ManagedX64.cs b/MurmurHash/Managed/Murmur128ManagedX64.cs
@@ -49,7 +49,6 @@ protected override void HashCore(byte[] array, int ibStart, int cbSize)
         {
             // increment our length
             Length += cbSize;
-
             Body(array, ibStart, cbSize);
         }
 
@@ -104,7 +103,6 @@ private void Tail(byte[] tail, int start, int remaining)
             H1 ^= (k1 * C1).RotateLeft(31) * C2;
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         protected override byte[] HashFinal()
         {
             ulong len = (ulong)Length;
diff --git a/MurmurHash/Unmanaged/Murmur128UnmanagedX64.cs b/MurmurHash/Unmanaged/Murmur128UnmanagedX64.cs
@@ -43,7 +43,6 @@ public override void Initialize()
             Reset();
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         protected override void HashCore(byte[] array, int ibStart, int cbSize)
         {
             // store the length of the hash (for use later)
@@ -109,7 +108,6 @@ unsafe private void Tail(byte* tail, int remaining)
             H1 ^= (k1 * C1).RotateLeft(31) * C2;
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         protected override byte[] HashFinal()
         {
             ulong len = (ulong)Length;
diff --git a/MurmurHash/Unmanaged/Murmur128UnmanagedX86.cs b/MurmurHash/Unmanaged/Murmur128UnmanagedX86.cs
@@ -46,7 +46,6 @@ public override void Initialize()
             Reset();
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         protected override void HashCore(byte[] array, int ibStart, int cbSize)
         {
             // store the length of the hash (for use later)
@@ -123,7 +122,6 @@ unsafe private void Tail(byte* tail, int remainder)
             H1 ^= (k1 * C1).RotateLeft(15) * C2;
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         protected override byte[] HashFinal()
         {
             uint len = (uint)Length;
diff --git a/MurmurHash/Unmanaged/Murmur32UnmanagedX86.cs b/MurmurHash/Unmanaged/Murmur32UnmanagedX86.cs
@@ -41,12 +41,9 @@ private void Body(byte[] data, int start, int length)
                 fixed (byte* d = &data[start])
                 {
                     uint* b = (uint*)d;
+
                     while (blocks-- > 0)
-                    {
-                        // grab our 4 byte key segments, stepping our offset position back each time
-                        // thus we are walking our array backwards
                         H1 = (((H1 ^ (((*b++ * C1).RotateLeft(15)) * C2)).RotateLeft(13)) * 5) + 0xe6546b64;
-                    }
 
                     if (remainder > 0)
                         Tail(d + (length - remainder), remainder);

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ protected override void HashCore(byte[] array, int ibStart, int cbSize)`
`49`	`49`	`{`
`50`	`50`	`// increment our length`
`51`	`51`	`Length += cbSize;`
`52`		`-`
`53`	`52`	`Body(array, ibStart, cbSize);`
`54`	`53`	`}`
`55`	`54`
`@@ -104,7 +103,6 @@ private void Tail(byte[] tail, int start, int remaining)`
`104`	`103`	`H1 ^= (k1 * C1).RotateLeft(31) * C2;`
`105`	`104`	`}`
`106`	`105`
`107`		`- [MethodImpl(MethodImplOptions.AggressiveInlining)]`
`108`	`106`	`protected override byte[] HashFinal()`
`109`	`107`	`{`
`110`	`108`	`ulong len = (ulong)Length;`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ public override void Initialize()`
`43`	`43`	`Reset();`
`44`	`44`	`}`
`45`	`45`
`46`		`- [MethodImpl(MethodImplOptions.AggressiveInlining)]`
`47`	`46`	`protected override void HashCore(byte[] array, int ibStart, int cbSize)`
`48`	`47`	`{`
`49`	`48`	`// store the length of the hash (for use later)`
`@@ -109,7 +108,6 @@ unsafe private void Tail(byte* tail, int remaining)`
`109`	`108`	`H1 ^= (k1 * C1).RotateLeft(31) * C2;`
`110`	`109`	`}`
`111`	`110`
`112`		`- [MethodImpl(MethodImplOptions.AggressiveInlining)]`
`113`	`111`	`protected override byte[] HashFinal()`
`114`	`112`	`{`
`115`	`113`	`ulong len = (ulong)Length;`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ public override void Initialize()`
`46`	`46`	`Reset();`
`47`	`47`	`}`
`48`	`48`
`49`		`- [MethodImpl(MethodImplOptions.AggressiveInlining)]`
`50`	`49`	`protected override void HashCore(byte[] array, int ibStart, int cbSize)`
`51`	`50`	`{`
`52`	`51`	`// store the length of the hash (for use later)`
`@@ -123,7 +122,6 @@ unsafe private void Tail(byte* tail, int remainder)`
`123`	`122`	`H1 ^= (k1 * C1).RotateLeft(15) * C2;`
`124`	`123`	`}`
`125`	`124`
`126`		`- [MethodImpl(MethodImplOptions.AggressiveInlining)]`
`127`	`125`	`protected override byte[] HashFinal()`
`128`	`126`	`{`
`129`	`127`	`uint len = (uint)Length;`