Thanks, should be fixed by r318456.

This was reverted.

@llvm/issue-subscribers-clang-frontend

Author: None (llvmbot)

int main(int argc, char** argv) {
  if (argc > 4);   // <-- Note semicolon!
  return 0;
}

eraseme.cc:2:16: warning: if statement has empty body [-Wempty-body]
  if (argc > 4);
               ^
eraseme.cc:2:16: note: put the semicolon on a separate line to silence this
      warning
1 warning generated.

int main(int argc, char** argv) {
  if (argc > 4)
    return 1;
  else;  // <- Semicolon
    return 2;
  return 0;
}

confirming that this is still the case in post 17 trunk(5a56f00)
https://godbolt.org/z/nqoqWeExb

code

int main(int argc, char** argv) {
  if (argc > 4)
    return 1;
  else;  // <- Semicolon
    return 2;
  return 0;
}

no warning given for clang

Commit that attempted to fix this: adefb76

Commit that revert it says it was reverted it: 59ad150

says:

This caused warnings also when the if or else comes from macros.

So someone can likely pick up the original fix and needs to add tests for macros to make sure this does not break likely existing code.

Also see 9541975 for an example for when the original fix that was reverted failed on.