Merge remote-tracking branch 'origin/topic/vern/zam-vector-cond-fix'

* origin/topic/vern/zam-vector-cond-fix:
  Fix for ZAM optimization of '?' conditional with vector-valued result
This commit is contained in:
Tim Wojtulewicz 2022-07-11 09:43:49 -07:00
commit 1226aa538a
5 changed files with 16 additions and 2 deletions

View file

@ -227,7 +227,7 @@ const ZAMStmt ZAMCompiler::CompileAssignExpr(const AssignExpr* e)
return CondC2VVC(lhs, n1, c3);
}
if ( r1 && r2 )
if ( r1 && r2 && ! r3 )
{
auto v1 = IsVector(r1->GetType()->Tag());
auto v2 = IsVector(r2->GetType()->Tag());