diff options
| author | Carol Eidt <carol.eidt@microsoft.com> | 2016-08-19 15:28:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-19 15:28:23 -0700 |
| commit | 9834cd1656c7d829a9247cf55d63d29b7ca0b4e8 (patch) | |
| tree | 70009edf8da5f9e5ff09d3a1a272f9a01c54f2c5 /src | |
| parent | 57211f039be0a860ae938e7b28f124c1ae6e1f32 (diff) | |
| parent | 1ca8b494fe38145f04753adc341d965f2bb328d6 (diff) | |
| download | coreclr-9834cd1656c7d829a9247cf55d63d29b7ca0b4e8.tar.gz coreclr-9834cd1656c7d829a9247cf55d63d29b7ca0b4e8.tar.bz2 coreclr-9834cd1656c7d829a9247cf55d63d29b7ca0b4e8.zip | |
Merge pull request #6813 from CarolEidt/FixArmCrossgen
Fix One Arm64 crossgen failure
Diffstat (limited to 'src')
| -rwxr-xr-x | src/jit/morph.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/jit/morph.cpp b/src/jit/morph.cpp index e055bd3a94..412e75e466 100755 --- a/src/jit/morph.cpp +++ b/src/jit/morph.cpp @@ -2031,7 +2031,13 @@ GenTreePtr Compiler::fgMakeTmpArgNode( } else { - arg = gtNewOperNode(GT_ADDR, type, arg); +#ifdef FEATURE_UNIX_AMD64_STRUCT_PASSING + // TODO-Cleanup: Fix this - we should never have an address that is TYP_STRUCT. + var_types addrType = type; +#else + var_types addrType = TYP_BYREF; +#endif + arg = gtNewOperNode(GT_ADDR, addrType, arg); addrNode = arg; #if FEATURE_MULTIREG_ARGS |