Safe Refactor - Remove conditional definition and references to lvIsMultiRegArgOrRet

diff --git a/src/jit/compiler.h b/src/jit/compiler.h
index 5203222da0f24544423916357b3ee6054f4f616b..06830f42b8038905decd632df8a6dc29b54bce4c 100644 (file)
--- a/src/jit/compiler.h
+++ b/src/jit/compiler.h
@@ -275,9 +275,8 @@ public:
     unsigned char       lvOverlappingFields :1;  // True when we have a struct with possibly overlapping fields
     unsigned char       lvContainsHoles     :1;  // True when we have a promoted struct that contains holes
     unsigned char       lvCustomLayout      :1;  // True when this struct has "CustomLayout"
-#if FEATURE_MULTIREG_ARGS_OR_RET
-    unsigned char       lvIsMultiRegArgOrRet:1; // Is this argument variable holding a value passed or returned in multiple registers?
-#endif
+    unsigned char       lvIsMultiRegArgOrRet:1; // Is this a struct that would be passed or returned in multiple registers?
+
 #ifdef _TARGET_ARM_
     // TODO-Cleanup: Can this be subsumed by the above?
     unsigned char       lvIsHfaRegArg:1;        // Is this argument variable holding a HFA register argument.
@@ -8812,6 +8811,7 @@ public:
     var_types getEightByteType(const SYSTEMV_AMD64_CORINFO_STRUCT_REG_PASSING_DESCRIPTOR& structDesc, unsigned slotNum);
     void fgMorphSystemVStructArgs(GenTreeCall* call, bool hasStructArgument);
 #endif // defined(FEATURE_UNIX_AMD64_STRUCT_PASSING)
+
 }; // end of class Compiler
 
 // Inline methods of CompAllocator.

diff --git a/src/jit/flowgraph.cpp b/src/jit/flowgraph.cpp
index 0aca16048e9fd3b0f3269b15e2cdadac9cc1e4d1..d075401ed420b717635cc67dae0f0c1913055ba7 100644 (file)
--- a/src/jit/flowgraph.cpp
+++ b/src/jit/flowgraph.cpp
@@ -7970,9 +7970,7 @@ void                Compiler::fgAddInternal()
         {
             lvaTable[genReturnLocal].lvType = TYP_STRUCT;
             lvaSetStruct(genReturnLocal, info.compMethodInfo->args.retTypeClass, true);
-#if FEATURE_MULTIREG_ARGS_OR_RET
             lvaTable[genReturnLocal].lvIsMultiRegArgOrRet = true;
-#endif
         }
         else
         {

diff --git a/src/jit/gschecks.cpp b/src/jit/gschecks.cpp
index 3a80aa4f4029a08e5b4e028bc81ef4d2a84c9974..f118cede4c3a6f1669535ffa86c3fcc070e2a99a 100644 (file)
--- a/src/jit/gschecks.cpp
+++ b/src/jit/gschecks.cpp
@@ -484,9 +484,7 @@ void Compiler::gsParamsToShadows()
             dst = gtNewOperNode(GT_ADDR, TYP_BYREF, dst);
 
             opAssign = gtNewCpObjNode(dst, src, clsHnd, false);
-#if FEATURE_MULTIREG_ARGS_OR_RET
             lvaTable[shadowVar].lvIsMultiRegArgOrRet = lvaTable[lclNum].lvIsMultiRegArgOrRet;
-#endif // FEATURE_MULTIREG_ARGS_OR_RET
         }
         else
         {

diff --git a/src/jit/importer.cpp b/src/jit/importer.cpp
index 0dbecf8ba85ae495b2819e58b77cddb681212500..7993918df0310ced3998026b4e217f4466788aec 100644 (file)
--- a/src/jit/importer.cpp
+++ b/src/jit/importer.cpp
@@ -7141,12 +7141,10 @@ GenTreePtr          Compiler::impFixupStructReturnType(GenTreePtr op, CORINFO_CL
     {
         if (op->gtOper == GT_LCL_VAR)
         {
-#if FEATURE_MULTIREG_RET
             // This LCL_VAR is an HFA return value, it stays as a TYP_STRUCT
             unsigned lclNum = op->gtLclVarCommon.gtLclNum;
             // Make sure this struct type stays as struct so that we can return it as an HFA
             lvaTable[lclNum].lvIsMultiRegArgOrRet = true;
-#endif // FEATURE_MULTIREG_RET
             return op;
         }