Merge commit '2807866fffca' from llvm.org/main into next

Author: git apple-llvm automerger

llvm/include/llvm/Object/ELFTypes.h

@@ -18,6 +18,7 @@
 #include "llvm/Support/Endian.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/MathExtras.h"
+#include "llvm/Support/UniqueBBID.h"
 #include <cassert>
 #include <cstdint>
 #include <cstring>
@@ -926,6 +927,8 @@ struct BBAddrMap {
         : ID(ID), Offset(Offset), Size(Size), MD(MD),
           CallsiteOffsets(std::move(CallsiteOffsets)) {}
 
+    UniqueBBID getID() const { return {ID, 0}; }
+
     bool operator==(const BBEntry &Other) const {
       return ID == Other.ID && Offset == Other.Offset && Size == Other.Size &&
              MD == Other.MD && CallsiteOffsets == Other.CallsiteOffsets;