From 5a407fa2c35ececb2f6f127ff6b6f5bf73fec0c5 Mon Sep 17 00:00:00 2001
From: Sinan Kaya <41809318+franksinankaya@users.noreply.github.com>
Date: Tue, 1 Oct 2019 03:04:31 -0400
Subject: [PATCH] Replace otherRegNum with GetOtherRegNum

Commit migrated from https://github.com/dotnet/coreclr/commit/8f719f2a37fd1741a4f55cf3026a3ce4d89f3bc6
---
 src/coreclr/src/jit/codegenxarch.cpp | 2 +-
 src/coreclr/src/jit/compiler.h       | 4 ++--
 src/coreclr/src/jit/lsraxarch.cpp    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/coreclr/src/jit/codegenxarch.cpp b/src/coreclr/src/jit/codegenxarch.cpp
index 1f0835c..d758109 100644
--- a/src/coreclr/src/jit/codegenxarch.cpp
+++ b/src/coreclr/src/jit/codegenxarch.cpp
@@ -5376,7 +5376,7 @@ void CodeGen::genCallInstruction(GenTreeCall* call)
                 else
                 {
                     assert(iterationNum == 1);
-                    argReg = curArgTabEntry->otherRegNum;
+                    argReg = curArgTabEntry->GetOtherRegNum();
                 }
 
                 genConsumeReg(putArgRegNode);
diff --git a/src/coreclr/src/jit/compiler.h b/src/coreclr/src/jit/compiler.h
index c82d8b2..21a8521 100644
--- a/src/coreclr/src/jit/compiler.h
+++ b/src/coreclr/src/jit/compiler.h
@@ -1411,8 +1411,8 @@ public:
     {
         return (regNumber)regNums[0];
     }
-    __declspec(property(get = getOtherRegNum)) regNumber otherRegNum;
-    regNumber getOtherRegNum()
+
+    regNumber GetOtherRegNum()
     {
         return (regNumber)regNums[1];
     }
diff --git a/src/coreclr/src/jit/lsraxarch.cpp b/src/coreclr/src/jit/lsraxarch.cpp
index 8352137..082cd27 100644
--- a/src/coreclr/src/jit/lsraxarch.cpp
+++ b/src/coreclr/src/jit/lsraxarch.cpp
@@ -1170,7 +1170,7 @@ int LinearScan::BuildCall(GenTreeCall* call)
             int i = 0;
             for (GenTreeFieldList* entry = argNode->AsFieldList(); entry != nullptr; entry = entry->Rest())
             {
-                const regNumber argReg = (i == 0) ? curArgTabEntry->regNum : curArgTabEntry->otherRegNum;
+                const regNumber argReg = (i == 0) ? curArgTabEntry->regNum : curArgTabEntry->GetOtherRegNum();
                 assert(entry->Current()->gtRegNum == argReg);
                 assert(i < 2);
                 i++;
-- 
2.7.4