Address CR feedback

Commit migrated from https://github.com/dotnet/coreclr/commit/891d7e7a69f4254b13de546b8fd60ded8cde866a

diff --git a/src/coreclr/src/zap/zapimport.cpp b/src/coreclr/src/zap/zapimport.cpp
index 8879964..2f64663 100644 (file)
--- a/src/coreclr/src/zap/zapimport.cpp
+++ b/src/coreclr/src/zap/zapimport.cpp
@@ -1674,7 +1674,7 @@ public:
 
     CORCOMPILE_FIXUP_BLOB_KIND GetKind()
     {
-        int kind = (int)(SIZE_T)GetHandle();
+        SIZE_T kind = (SIZE_T)GetHandle();
 
         if ((kind & 1) == 1)
         {

diff --git a/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h b/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h
index 6b38ec9..a2c05f0 100644 (file)
--- a/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h
+++ b/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h
@@ -375,7 +375,7 @@ void ChangeNumberSequential(NumberSequential* p)
 bool IsCorrectNumberSequential(NumberSequential* p)
 {
        if(p->i32 != (-0x7fffffff - 1) || p->ui32 != 0xffffffff || p->s1 != -0x8000 || p->us1 != 0xffff || p->b != 0 ||
-               p->sb != 0x7f ||p->i16 != -0x8000 || p->ui16 != 0xffff || p->i64 != (unsigned)-1234567890 ||
+               p->sb != 0x7f ||p->i16 != -0x8000 || p->ui16 != 0xffff || p->i64 != (uint64_t)-1234567890 ||
                p->ui64 != 1234567890 || (p->sgl) != 32.0 || p->d != 3.2)
        {
                return false;

diff --git a/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/ExpStructAsParamNative.h b/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/ExpStructAsParamNative.h
index 0c931c6..1a8b034 100644 (file)
--- a/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/ExpStructAsParamNative.h
+++ b/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/ExpStructAsParamNative.h
@@ -405,7 +405,7 @@ void ChangeNumberSequential(NumberSequential* p)
 bool IsCorrectNumberSequential(NumberSequential* p)
 {
     if(p->i32 != INT_MIN || p->ui32 != 0xffffffff || p->s1 != -0x8000 || p->us1 != 0xffff || p->b != 0 ||
-        p->sb != 0x7f ||p->i16 != -0x8000 || p->ui16 != 0xffff || p->i64 != (unsigned)-1234567890 ||
+        p->sb != 0x7f ||p->i16 != -0x8000 || p->ui16 != 0xffff || p->i64 != (uint64_t)-1234567890 ||
         p->ui64 != 1234567890 || (p->sgl) != 32.0 || p->d != 3.2)
     {
         return false;

diff --git a/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/SeqStructDelRevPInvokeNative.h b/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/SeqStructDelRevPInvokeNative.h
index 30205ba..318035d 100644 (file)
--- a/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/SeqStructDelRevPInvokeNative.h
+++ b/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/SeqStructDelRevPInvokeNative.h
@@ -393,7 +393,7 @@ void ChangeNumberSequential(NumberSequential* p)
 bool IsCorrectNumberSequential(NumberSequential* p)
 {
     if(p->i32 != INT_MIN || p->ui32 != 0xffffffff || p->s1 != -0x8000 || p->us1 != 0xffff || p->b != 0 ||
-        p->sb != 0x7f ||p->i16 != -0x8000 || p->ui16 != 0xffff || p->i64 != (unsigned)-1234567890 ||
+        p->sb != 0x7f ||p->i16 != -0x8000 || p->ui16 != 0xffff || p->i64 != (uint64_t)-1234567890 ||
         p->ui64 != 1234567890 || (p->sgl) != 32.0 || p->d != 3.2)
     {
         return false;

diff --git a/src/coreclr/tests/src/JIT/jit64/mcc/interop/native_i1c.cpp b/src/coreclr/tests/src/JIT/jit64/mcc/interop/native_i1c.cpp
index 35c70ac..ae69fa0 100644 (file)
--- a/src/coreclr/tests/src/JIT/jit64/mcc/interop/native_i1c.cpp
+++ b/src/coreclr/tests/src/JIT/jit64/mcc/interop/native_i1c.cpp
@@ -9,15 +9,15 @@ MCC_API VType1 sum(double first, ...) {
 
     int count = 0;
     float sum = 0.0;
-    float val = (float)first;
+    double val = first;
     va_list args;
 
     // initialize variable arguments.
     va_start(args, first);
-    while (val != (float)-1) {
-        sum += val;
+    while (val != (double)-1) {
+        sum += (float)val;
         count++;
-        val = (float)va_arg(args, double);
+        val = va_arg(args, double);
     }
     // reset variable arguments.
     va_end(args);