1542146 - Use the new option StatementMacros from clang-format-8

Status: RESOLVED FIXED

(Developer Infrastructure :: Lint and Formatting, enhancement)

Description

[Sylvestre Ledru [:Sylvestre]]

It helps clang-format-8 to know if they should be considered as function
https://reviews.llvm.org/D33440

StatementMacros: [MARKUPMAP, ASSERT_TRUE, ASSERT_FALSE, TEST, CHECK]

Comment 1

[Sylvestre Ledru [:Sylvestre]]

Attachment: Bug 1542146 - Use the new option StatementMacros from clang-format-8 r?andi

Depends on D26098

Comment 2

[Sylvestre Ledru [:Sylvestre]]

Attachment: Bug 1542146 - Apply the change with the option StatementMacros from clang-format-8 r?andi

ignore-this-changeset

Depends on D26279

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/55ed5f885d52
Use the new option StatementMacros from clang-format-8 r=andi
https://hg.mozilla.org/integration/autoland/rev/6f723cac81dd
Apply the change with the option StatementMacros from clang-format-8 r=andi

Comment 4

[Andreea Pavel [:apavel]]

https://hg.mozilla.org/mozilla-central/rev/55ed5f885d52
https://hg.mozilla.org/mozilla-central/rev/6f723cac81dd

Comment 5

[Chris Peterson [:cpeterson]]

If you're reading this bug because you're now getting unknown key 'StatementMacros' error messages when you try to hg commit: you need to re-run ./mach bootstrap to get the latest clang-format.

YAML:28:19: error: unknown key 'StatementMacros'
StatementMacros: [MARKUPMAP, ASSERT_TRUE, ASSERT_FALSE, TEST, CHECK]
                  ^

Comment 6

[Sylvestre Ledru [:Sylvestre]]

I am not sure why the new version of clang-format isn't downloaded immediately :/
Andi, any idea why? Thanks

Comment 7

[Andi [:andi]]

Yes it's the same thing that we have with clang-tidy based analysis, we don't have a setup that detects that the artifact is newer than what we have locally in order to begin the update process.
This was one of the reasons why we've added clang-tidy package to bootstrap, but this is sub-optimal so I've opened bug 1542694 for this.

Comment 8

[Botond Ballo [:botond]]

I ran mach bootstrap, and ~/.mozbuild/clang/bin/clang-format --version is still giving me 7.0.1.

Comment 9

[Botond Ballo [:botond]]

So does ~/.mozbuild/clang-tools/clang-tidy/bin/clang-format --version. (Why is there two and which one should I be using?)

Comment 10

[Botond Ballo [:botond]]

I had to comment out the StatementMacros: ... line in .clang-format to allow my editor's clang-format integration to continue working for the time being.

Comment 11

[Botond Ballo [:botond]]

Ok, I figured this out: I had run mach bootstrap in a different tree, which was not updated to the latest mozilla-central. I did not realize mach bootstrap looked at in-tree files to determine what versions to download (though in retrospect that makes sense).

Comment 12

[Andi [:andi]]

I feel the need to add some clarifications here:

• ~/.mozbuild/clang represents the artifact for the compiler
• ~/.mozbuild/clang-tools/clang-tidy represents the artifact for clang based static analysis, like clang-tidy and for formatting, clang-format

The artifacts that we download, ex. clang-tidy and clang are tied up with the version of the tree that we are using, so in order to get the latest artifacts you need to be on he head of the mozilla-central.

Comment 13

[Botond Ballo [:botond]]

(In reply to Andi-Bogdan Postelnicu [:andi] from comment #12)

The artifacts that we download, ex. clang-tidy and clang are tied up with the version of the tree that we are using, so in order to get the latest artifacts you need to be on he head of the mozilla-central.

Apologies for starting to veer off topic, but this makes me wonder: is it then possible to get into a situation where you'd like to do development simultaneously on e.g. a central tree and a beta tree, but you can't because they share the .mozbuild artifacts and they require different versions of them?

Comment 14

[Brian Birtles (:birtles)]

I am running into the same issue with editor integration since vim-clang-format seems to always look to the system clang-format (unlike clang-format.py which has g:clang_format_path) and Ubuntu seems to be stuck on clang-format 6.0.0.

Comment 15

[Sylvestre Ledru [:Sylvestre]]

You can update to clang-format 8 by using https://apt.llvm.org/ on Ubuntu but I recommend that you update vim-clang-format to use ~/.mozbuild/clang-tools/clang-tidy/bin/clang-format

Comment 16

[Brian Birtles (:birtles)]

Thanks! It turns out there is an option in vim-clang-format after all:

let g:clang_format#command = $HOME . '/.mozbuild/clang-tools/clang-tidy/bin/clang-format'