diff options
Diffstat (limited to 'src/vm/object.cpp')
| -rw-r--r-- | src/vm/object.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vm/object.cpp b/src/vm/object.cpp index 1ff98d11da..bb7c8e713e 100644 --- a/src/vm/object.cpp +++ b/src/vm/object.cpp @@ -590,7 +590,7 @@ void STDCALL CopyValueClassArgUnchecked(ArgDestination *argDest, void* src, Meth STATIC_CONTRACT_FORBID_FAULT; STATIC_CONTRACT_MODE_COOPERATIVE; -#if defined(UNIX_AMD64_ABI) && defined(FEATURE_UNIX_AMD64_STRUCT_PASSING) +#if defined(UNIX_AMD64_ABI) if (argDest->IsStructPassedInRegs()) { @@ -606,7 +606,7 @@ void STDCALL CopyValueClassArgUnchecked(ArgDestination *argDest, void* src, Meth return; } -#endif // UNIX_AMD64_ABI && FEATURE_UNIX_AMD64_STRUCT_PASSING +#endif // UNIX_AMD64_ABI // destOffset is only valid for Nullable<T> passed in registers _ASSERTE(destOffset == 0); @@ -621,7 +621,7 @@ void InitValueClassArg(ArgDestination *argDest, MethodTable *pMT) STATIC_CONTRACT_FORBID_FAULT; STATIC_CONTRACT_MODE_COOPERATIVE; -#if defined(UNIX_AMD64_ABI) && defined(FEATURE_UNIX_AMD64_STRUCT_PASSING) +#if defined(UNIX_AMD64_ABI) if (argDest->IsStructPassedInRegs()) { @@ -2050,7 +2050,7 @@ BOOL Nullable::UnBoxIntoArgNoGC(ArgDestination *argDest, OBJECTREF boxedVal, Met } CONTRACTL_END; -#if defined(UNIX_AMD64_ABI) && defined(FEATURE_UNIX_AMD64_STRUCT_PASSING) +#if defined(UNIX_AMD64_ABI) if (argDest->IsStructPassedInRegs()) { // We should only get here if we are unboxing a T as a Nullable<T> @@ -2088,7 +2088,7 @@ BOOL Nullable::UnBoxIntoArgNoGC(ArgDestination *argDest, OBJECTREF boxedVal, Met return TRUE; } -#endif // UNIX_AMD64_ABI && FEATURE_UNIX_AMD64_STRUCT_PASSING +#endif // UNIX_AMD64_ABI return UnBoxNoGC(argDest->GetDestinationAddress(), boxedVal, destMT); } |