Fixes for zero diffs

diff --git a/src/jit/compiler.cpp b/src/jit/compiler.cpp
index 159048c..5c20a87 100644 (file)
--- a/src/jit/compiler.cpp
+++ b/src/jit/compiler.cpp
@@ -9686,9 +9686,9 @@ int cTreeFlagsIR(Compiler* comp, GenTree* tree)
                         chars += printf("[ICON_FTN_ADDR]");
                         break;
 
-                    case GTF_ICON_MID_HDL:
+                    case GTF_ICON_CIDMID_HDL:
 
-                        chars += printf("[ICON_MID_HDL]");
+                        chars += printf("[ICON_CIDMID_HDL]");
                         break;
 
                     case GTF_ICON_BBC_PTR:
@@ -10417,7 +10417,7 @@ int cLeafIR(Compiler* comp, GenTree* tree)
                 chars += printf("FTN(?)");
                 break;
 
-            case GTF_ICON_MID_HDL:
+            case GTF_ICON_CIDMID_HDL:
 
                 chars += printf("CIDMID(?)");
                 break;

diff --git a/src/jit/flowgraph.cpp b/src/jit/flowgraph.cpp
index 603b03f..e83f5e7 100644 (file)
--- a/src/jit/flowgraph.cpp
+++ b/src/jit/flowgraph.cpp
@@ -7034,7 +7034,7 @@ GenTreeCall* Compiler::fgGetStaticsCCtorHelper(CORINFO_CLASS_HANDLE cls, CorInfo
 
     if (pmoduleID)
     {
-        opModuleIDArg = gtNewIndOfIconHandleNode(TYP_I_IMPL, (size_t)pmoduleID, GTF_ICON_MID_HDL, true);
+        opModuleIDArg = gtNewIndOfIconHandleNode(TYP_I_IMPL, (size_t)pmoduleID, GTF_ICON_CIDMID_HDL, true);
     }
     else
     {
@@ -7045,7 +7045,7 @@ GenTreeCall* Compiler::fgGetStaticsCCtorHelper(CORINFO_CLASS_HANDLE cls, CorInfo
     {
         if (pclsID)
         {
-            opClassIDArg = gtNewIndOfIconHandleNode(TYP_I_IMPL, (size_t)pclsID, GTF_ICON_CLASS_HDL, false);
+            opClassIDArg = gtNewIndOfIconHandleNode(TYP_INT, (size_t)pclsID, GTF_ICON_CIDMID_HDL, true);
         }
         else
         {

diff --git a/src/jit/gentree.cpp b/src/jit/gentree.cpp
index c7118d6..8a86ff1 100644 (file)
--- a/src/jit/gentree.cpp
+++ b/src/jit/gentree.cpp
@@ -10667,8 +10667,8 @@ void Compiler::gtDispConst(GenTree* tree)
                         case GTF_ICON_FTN_ADDR:
                             printf(" ftn");
                             break;
-                        case GTF_ICON_MID_HDL:
-                            printf(" module");
+                        case GTF_ICON_CIDMID_HDL:
+                            printf(" cid/mid");
                             break;
                         case GTF_ICON_BBC_PTR:
                             printf(" bbc");

diff --git a/src/jit/gentree.h b/src/jit/gentree.h
index ccd0146..66dc4cd 100644 (file)
--- a/src/jit/gentree.h
+++ b/src/jit/gentree.h
@@ -1017,7 +1017,7 @@ public:
 #define GTF_ICON_TOKEN_HDL          0xB0000000 // GT_CNS_INT -- constant is a token handle
 #define GTF_ICON_TLS_HDL            0xC0000000 // GT_CNS_INT -- constant is a TLS ref with offset
 #define GTF_ICON_FTN_ADDR           0xD0000000 // GT_CNS_INT -- constant is a function address
-#define GTF_ICON_MID_HDL            0xE0000000 // GT_CNS_INT -- constant is a module ID handle
+#define GTF_ICON_CIDMID_HDL         0xE0000000 // GT_CNS_INT -- constant is a class ID or a module ID
 #define GTF_ICON_BBC_PTR            0xF0000000 // GT_CNS_INT -- constant is a basic block count pointer
 
 #define GTF_ICON_FIELD_OFF          0x08000000 // GT_CNS_INT -- constant is a field offset