From: dotnet bot Date: Wed, 12 Apr 2017 22:27:09 +0000 (-0700) Subject: Merge changes from TFS (dotnet/coreclr#10926) X-Git-Tag: submit/tizen/20210909.063632~11030^2~7280 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d581da322610a255cb5d7be273aad5830084267;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Merge changes from TFS (dotnet/coreclr#10926) * Fix desktop build break [tfs-changeset: 1654125] * JIT formatting Commit migrated from https://github.com/dotnet/coreclr/commit/07606103cee92290abe7958502a70e01c0df4870 --- diff --git a/src/coreclr/src/jit/codegenarmarch.cpp b/src/coreclr/src/jit/codegenarmarch.cpp index 8c06e5e..af9fdfe 100644 --- a/src/coreclr/src/jit/codegenarmarch.cpp +++ b/src/coreclr/src/jit/codegenarmarch.cpp @@ -103,8 +103,8 @@ void CodeGen::genPutArgStk(GenTreePutArgStk* treeNode) // This is the varNum for our store operations, // typically this is the varNum for the Outgoing arg space // When we are generating a tail call it will be the varNum for arg0 - unsigned varNumOut; - unsigned argOffsetMax; // Records the maximum size of this area for assert checks + unsigned varNumOut = (unsigned)-1; + unsigned argOffsetMax = (unsigned)-1; // Records the maximum size of this area for assert checks // Get argument offset to use with 'varNumOut' // Here we cross check that argument offset hasn't changed from lowering to codegen since diff --git a/src/coreclr/src/jit/jit.settings.targets b/src/coreclr/src/jit/jit.settings.targets index 8749b80..bde6395 100644 --- a/src/coreclr/src/jit/jit.settings.targets +++ b/src/coreclr/src/jit/jit.settings.targets @@ -120,6 +120,9 @@ + + + @@ -129,6 +132,9 @@ + + +