Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 0760610

Browse files
dotnet-botBruceForstall
authored andcommitted
Merge changes from TFS (#10926)
* Fix desktop build break [tfs-changeset: 1654125] * JIT formatting
1 parent fa7293a commit 0760610

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/jit/codegenarmarch.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ void CodeGen::genPutArgStk(GenTreePutArgStk* treeNode)
103103
// This is the varNum for our store operations,
104104
// typically this is the varNum for the Outgoing arg space
105105
// When we are generating a tail call it will be the varNum for arg0
106-
unsigned varNumOut;
107-
unsigned argOffsetMax; // Records the maximum size of this area for assert checks
106+
unsigned varNumOut = (unsigned)-1;
107+
unsigned argOffsetMax = (unsigned)-1; // Records the maximum size of this area for assert checks
108108

109109
// Get argument offset to use with 'varNumOut'
110110
// Here we cross check that argument offset hasn't changed from lowering to codegen since

src/jit/jit.settings.targets

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@
120120
<CppCompile Include="..\TargetArm.cpp" />
121121
<CppCompile Condition="'$(ClDefines.Contains(`LEGACY_BACKEND`))'=='True'" Include="..\registerfp.cpp" />
122122
<CppCompile Condition="'$(ClDefines.Contains(`LEGACY_BACKEND`))'=='False'" Include="..\DecomposeLongs.cpp" />
123+
<CppCompile Condition="'$(ClDefines.Contains(`LEGACY_BACKEND`))'=='False'" Include="..\LowerArmArch.cpp" />
124+
<CppCompile Condition="'$(ClDefines.Contains(`LEGACY_BACKEND`))'=='False'" Include="..\lsraarmarch.cpp" />
125+
<CppCompile Condition="'$(ClDefines.Contains(`LEGACY_BACKEND`))'=='False'" Include="..\CodeGenArmArch.cpp" />
123126
<CppCompile Condition="'$(ClDefines.Contains(`LEGACY_BACKEND`))'=='False'" Include="..\LowerArm.cpp" />
124127
<CppCompile Condition="'$(ClDefines.Contains(`LEGACY_BACKEND`))'=='False'" Include="..\lsraarm.cpp" />
125128
<CppCompile Condition="'$(ClDefines.Contains(`LEGACY_BACKEND`))'=='False'" Include="..\CodeGenArm.cpp" />
@@ -129,6 +132,9 @@
129132
<!-- ARM64 target is always RyuJIT backend -->
130133
<CppCompile Include="..\emitarm64.cpp" />
131134
<CppCompile Include="..\TargetArm64.cpp" />
135+
<CppCompile Include="..\LowerArmArch.cpp" />
136+
<CppCompile Include="..\lsraarmarch.cpp" />
137+
<CppCompile Include="..\CodeGenArmArch.cpp" />
132138
<CppCompile Include="..\LowerArm64.cpp" />
133139
<CppCompile Include="..\lsraarm64.cpp" />
134140
<CppCompile Include="..\CodeGenArm64.cpp" />

0 commit comments

Comments
 (0)