osx fixes

Author: cshung

src/coreclr/gc/vxsort/packer.h

@@ -87,8 +87,8 @@ class packer {
 
         assert(AH::is_aligned(mem_read));
 
-        auto memv_read = (TV *) mem_read;
-        auto memv_write = (TV *) mem_write;
+        TV * memv_read = (TV *) mem_read;
+        TV * memv_write = (TV *) mem_write;
 
         auto lenv = len / N;
         len -= (lenv * N);
@@ -184,8 +184,8 @@ class packer {
         assert(AH::is_aligned(mem_read));
 
         auto lenv = len / (N * 2);
-        auto memv_read = ((TV *) mem_read) - 1;
-        auto memv_write = ((TV *) mem_write) - 2;
+        TV * memv_read = ((TV *) mem_read) - 1;
+        TV * memv_write = ((TV *) mem_write) - 2;
         len -= lenv * N * 2;
 
         while (lenv >= Unroll) {

src/coreclr/gc/vxsort/vxsort.h

@@ -426,16 +426,16 @@ class vxsort {
 
         // From now on, we are fully aligned
         // and all reading is done in full vector units
-        auto readLeftV = (TV*) readLeft;
-        auto readRightV = (TV*) readRight;
+        TV* readLeftV = (TV*) readLeft;
+        TV* readRightV = (TV*) readRight;
         #ifndef NDEBUG
         readLeft = nullptr;
         readRight = nullptr;
         #endif
 
         for (auto u = 0; u < InnerUnroll; u++) {
-            auto dl = MT::load_vec(readLeftV + u);
-            auto dr = MT::load_vec(readRightV - (u + 1));
+            TV dl = MT::load_vec(readLeftV + u);
+            TV dr = MT::load_vec(readRightV - (u + 1));
             partition_block(dl, P, tmpLeft, tmpRight);
             partition_block(dr, P, tmpLeft, tmpRight);
         }
@@ -526,7 +526,7 @@ class vxsort {
                 readLeftV += 1;
             }
 
-            auto d = MT::load_vec(nextPtr);
+            TV d = MT::load_vec(nextPtr);
             partition_block(d, P, writeLeft, writeRight);
             //partition_block_without_compress(d, P, writeLeft, writeRight);
         }
@@ -561,8 +561,8 @@ class vxsort {
         const auto rightAlign = hint.right_align;
         const auto rai = ~((rightAlign - 1) >> 31);
         const auto lai = leftAlign >> 31;
-        const auto preAlignedLeft  = (TV*) (left + leftAlign);
-        const auto preAlignedRight = (TV*) (right + rightAlign - N);
+        TV* const  preAlignedLeft  = (TV*) (left + leftAlign);
+        TV* const  preAlignedRight = (TV*) (right + rightAlign - N);
 
 #ifdef VXSORT_STATS
         vxsort_stats<T>::bump_vec_loads(2);
@@ -581,8 +581,8 @@ class vxsort {
         //       were actually needed to be written to the right hand side
         //    e) We write the right portion of the left vector to the right side
         //       now that its write position has been updated
-        auto RT0 = MT::load_vec(preAlignedRight);
-        auto LT0 = MT::load_vec(preAlignedLeft);
+        TV RT0 = MT::load_vec(preAlignedRight);
+        TV LT0 = MT::load_vec(preAlignedLeft);
         auto rtMask = MT::get_cmpgt_mask(RT0, P);
         auto ltMask = MT::get_cmpgt_mask(LT0, P);
         const auto rtPopCountRightPart = max(_mm_popcnt_u32(rtMask), rightAlign);