From 6623e1fcaa9b29895606df64ff6ca4b087e58b8e Mon Sep 17 00:00:00 2001 From: Sinan Kaya <41809318+franksinankaya@users.noreply.github.com> Date: Wed, 9 Oct 2019 01:17:55 -0700 Subject: [PATCH] Replace isHfaArg with IsHfaArg() Commit migrated from https://github.com/dotnet/coreclr/commit/9e6f164a41cfe6af6a7de2765eb4a6cc695032cd --- src/coreclr/src/jit/compiler.h | 5 ++--- src/coreclr/src/jit/morph.cpp | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/coreclr/src/jit/compiler.h b/src/coreclr/src/jit/compiler.h index 893ad43..fda71c4 100644 --- a/src/coreclr/src/jit/compiler.h +++ b/src/coreclr/src/jit/compiler.h @@ -1457,8 +1457,7 @@ public: #endif // FEATURE_VARARG } - __declspec(property(get = getIsHfaArg)) bool isHfaArg; - bool getIsHfaArg() + bool IsHfaArg() { #ifdef FEATURE_HFA return IsHfa(_hfaElemKind); @@ -1545,7 +1544,7 @@ public: } #endif // _TARGET_ARM_ - if (!isHfaArg) + if (!IsHfaArg()) { // We haven't previously set this; do so now. _hfaElemKind = HfaElemKindFromType(type); diff --git a/src/coreclr/src/jit/morph.cpp b/src/coreclr/src/jit/morph.cpp index 0c6958a..8cce957 100644 --- a/src/coreclr/src/jit/morph.cpp +++ b/src/coreclr/src/jit/morph.cpp @@ -3689,7 +3689,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call) { if (isPow2(passingSize)) { - canTransform = (!argEntry->isHfaArg || (passingSize == genTypeSize(argEntry->GetHfaType()))); + canTransform = (!argEntry->IsHfaArg() || (passingSize == genTypeSize(argEntry->GetHfaType()))); } #if defined(_TARGET_ARM64_) || defined(UNIX_AMD64_ABI) @@ -4176,12 +4176,12 @@ void Compiler::fgMorphMultiregStructArgs(GenTreeCall* call) } unsigned size = (fgEntryPtr->numRegs + fgEntryPtr->numSlots); - if ((size > 1) || (fgEntryPtr->isHfaArg && argx->TypeGet() == TYP_STRUCT)) + if ((size > 1) || (fgEntryPtr->IsHfaArg() && argx->TypeGet() == TYP_STRUCT)) { foundStructArg = true; if (varTypeIsStruct(argx) && !argx->OperIs(GT_FIELD_LIST)) { - if (fgEntryPtr->isHfaArg) + if (fgEntryPtr->IsHfaArg()) { var_types hfaType = fgEntryPtr->GetHfaType(); unsigned structSize; -- 2.7.4