Sorry for the delay. I'll submit this for you.

I'll merge this.

Thank you!

Generally I'm against introducing new style flags or flag options unless a supported style requires it.
IMO this increases maintenance burden and can quickly lead to a big space of style flags that contain tricky incompatibilities.

I believe there is no such thing as an "short else statement". The else is part of the if statement and if it is present, I don't consider the whole if statement short. As such, IMO the bug is invalid.

• Add a note about intent

In D60263#1454812, @thakis wrote:

Why would we want this to be different in Obj-C and C++?

• Address review comments

• Cleanup

• Use exsiting implementation

nit: Please add a sentence on what this patch does in the description.

No worries. Thanks for the quick response!

Thank you!

Sorry, already fixed by https://reviews.llvm.org/rL353134.

That triggers a warning:

llvm/lib/Transforms/IPO/SampleProfile.cpp:1331:50: error: non-constant-expression cannot be narrowed from type 'unsigned long' to 'unsigned int' in initializer list [-Wc++11-narrowing]
                        MDB.createBranchWeights({BlockWeights[BB]}));
                                                 ^~~~~~~~~~~~~~~~

• Format tests