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

Commit

Permalink
Fix for issue 5639
Browse files Browse the repository at this point in the history 
Added check for hfa type
Update Test.lst removing the appropriate R2R_FAIL tags
  • Loading branch information
@briansull
briansull committed Jun 24, 2016
1 parent 4fb8970 commit 81b2abb
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/jit/morph.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4512,7 +4512,7 @@ GenTreePtr Compiler::fgMorphMultiregStructArg(GenTreePtr arg, fgArgTabEntryPt

// Is this LclVar a promoted struct with exactly 2 fields?
// TODO-ARM64-CQ: Support struct promoted HFA types here
if (varDsc->lvPromoted && (varDsc->lvFieldCnt == 2))
if (varDsc->lvPromoted && (varDsc->lvFieldCnt == 2) && !varDsc->lvIsHfa())
{
// See if we have two promoted fields that start at offset 0 and 8?
unsigned loVarNum = lvaGetFieldLocal(varDsc, 0);
Expand Down
24 changes: 12 additions & 12 deletions tests/arm64/Tests.lst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34822,14 +34822,14 @@ RelativePath=JIT\jit64\hfa\main\testA\hfa_sd2A_d\hfa_sd2A_d.cmd
WorkingDir=JIT\jit64\hfa\main\testA\hfa_sd2A_d
Expected=0
MaxAllowedDurationSeconds=600
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;R2R_FAIL;ISSUE_5639
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
HostStyle=0
[hfa_sd2A_r.cmd_5016]
RelativePath=JIT\jit64\hfa\main\testA\hfa_sd2A_r\hfa_sd2A_r.cmd
WorkingDir=JIT\jit64\hfa\main\testA\hfa_sd2A_r
Expected=0
MaxAllowedDurationSeconds=600
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;R2R_FAIL;ISSUE_5639
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
HostStyle=0
[hfa_sf0A_d.cmd_5017]
RelativePath=JIT\jit64\hfa\main\testA\hfa_sf0A_d\hfa_sf0A_d.cmd
Expand Down Expand Up @@ -34864,14 +34864,14 @@ RelativePath=JIT\jit64\hfa\main\testA\hfa_sf2A_d\hfa_sf2A_d.cmd
WorkingDir=JIT\jit64\hfa\main\testA\hfa_sf2A_d
Expected=0
MaxAllowedDurationSeconds=600
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;R2R_FAIL;ISSUE_5639
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
HostStyle=0
[hfa_sf2A_r.cmd_5022]
RelativePath=JIT\jit64\hfa\main\testA\hfa_sf2A_r\hfa_sf2A_r.cmd
WorkingDir=JIT\jit64\hfa\main\testA\hfa_sf2A_r
Expected=0
MaxAllowedDurationSeconds=600
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;R2R_FAIL;ISSUE_5639
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
HostStyle=0
[hfa_nd0B_d.cmd_5023]
RelativePath=JIT\jit64\hfa\main\testB\hfa_nd0B_d\hfa_nd0B_d.cmd
Expand Down Expand Up @@ -34948,14 +34948,14 @@ RelativePath=JIT\jit64\hfa\main\testB\hfa_sd2B_d\hfa_sd2B_d.cmd
WorkingDir=JIT\jit64\hfa\main\testB\hfa_sd2B_d
Expected=0
MaxAllowedDurationSeconds=600
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;R2R_FAIL;ISSUE_5639
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
HostStyle=0
[hfa_sd2B_r.cmd_5034]
RelativePath=JIT\jit64\hfa\main\testB\hfa_sd2B_r\hfa_sd2B_r.cmd
WorkingDir=JIT\jit64\hfa\main\testB\hfa_sd2B_r
Expected=0
MaxAllowedDurationSeconds=600
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;R2R_FAIL;ISSUE_5639
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
HostStyle=0
[hfa_sf0B_d.cmd_5035]
RelativePath=JIT\jit64\hfa\main\testB\hfa_sf0B_d\hfa_sf0B_d.cmd
Expand All @@ -34976,14 +34976,14 @@ RelativePath=JIT\jit64\hfa\main\testB\hfa_sf2B_d\hfa_sf2B_d.cmd
WorkingDir=JIT\jit64\hfa\main\testB\hfa_sf2B_d
Expected=0
MaxAllowedDurationSeconds=600
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;R2R_FAIL;ISSUE_5639
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
HostStyle=0
[hfa_sf2B_r.cmd_5038]
RelativePath=JIT\jit64\hfa\main\testB\hfa_sf2B_r\hfa_sf2B_r.cmd
WorkingDir=JIT\jit64\hfa\main\testB\hfa_sf2B_r
Expected=0
MaxAllowedDurationSeconds=600
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;R2R_FAIL;ISSUE_5639
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
HostStyle=0
[hfa_nd0C_d.cmd_5039]
RelativePath=JIT\jit64\hfa\main\testC\hfa_nd0C_d\hfa_nd0C_d.cmd
Expand Down Expand Up @@ -35102,14 +35102,14 @@ RelativePath=JIT\jit64\hfa\main\testC\hfa_sd2C_d\hfa_sd2C_d.cmd
WorkingDir=JIT\jit64\hfa\main\testC\hfa_sd2C_d
Expected=0
MaxAllowedDurationSeconds=600
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP;R2R_FAIL;ISSUE_5639
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP;ISSUE_5639
HostStyle=0
[hfa_sd2C_r.cmd_5056]
RelativePath=JIT\jit64\hfa\main\testC\hfa_sd2C_r\hfa_sd2C_r.cmd
WorkingDir=JIT\jit64\hfa\main\testC\hfa_sd2C_r
Expected=0
MaxAllowedDurationSeconds=600
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP;R2R_FAIL;ISSUE_5639
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP;ISSUE_5639
HostStyle=0
[hfa_sf0C_d.cmd_5057]
RelativePath=JIT\jit64\hfa\main\testC\hfa_sf0C_d\hfa_sf0C_d.cmd
Expand Down Expand Up @@ -35144,14 +35144,14 @@ RelativePath=JIT\jit64\hfa\main\testC\hfa_sf2C_d\hfa_sf2C_d.cmd
WorkingDir=JIT\jit64\hfa\main\testC\hfa_sf2C_d
Expected=0
MaxAllowedDurationSeconds=600
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP;R2R_FAIL;ISSUE_5639
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP;ISSUE_5639
HostStyle=0
[hfa_sf2C_r.cmd_5062]
RelativePath=JIT\jit64\hfa\main\testC\hfa_sf2C_r\hfa_sf2C_r.cmd
WorkingDir=JIT\jit64\hfa\main\testC\hfa_sf2C_r
Expected=0
MaxAllowedDurationSeconds=600
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP;R2R_FAIL;ISSUE_5639
Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP;ISSUE_5639
HostStyle=0
[hfa_nd0E_d.cmd_5063]
RelativePath=JIT\jit64\hfa\main\testE\hfa_nd0E_d\hfa_nd0E_d.cmd
Expand Down

0 comments on commit 81b2abb

Please sign in to comment.