[Bug tree-optimization/116890] Heurstic for factoring out convert with one side constant should also handle when it is a CMP

[pinskia at gcc dot gnu.org via Gcc-bugs]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116890

--- Comment #2 from Andrew Pinski <pinskia at gcc dot gnu.org> ---
Here is another example:
```
int g(bool a, bool b, int c)
{
  int x;
  if (c) x = a | b;
  else x = 1;
  return x;
}

int g1(bool a, bool b, int c)
{
  bool x;
  if (c) x = a | b;
  else x = 1;
  return x;
}
```