I can convert it to the patch. Replacing is required because clang is more strict than gcc about this.