After changes inllvm#145793./home/david.spickett/llvm-project/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp:1360:49: error: non-const lvalue reference to type 'uint64_t' (aka 'unsigned long long') cannot bind to a value of unrelated type 'size_t' (aka 'unsigned int') 1360 |   status = m_disasm_up->getInstruction(mc_inst, size, data, pc, llvm::nulls());      |                                                 ^~~~/home/david.spickett/llvm-project/llvm/include/llvm/MC/MCDisassembler/MCDisassembler.h:135:64: note: passing argument to parameter 'Size' here  135 |   virtual DecodeStatus getInstruction(MCInst &Instr, uint64_t &Size,      |                                                                ^1 error generated.The type used in the LLVM method we call is uin64_t so use that instead.It's overkill for what it is, but that's a separate issue if anyone cares.Also removed the unused form of GetMCInst.(cherry picked from commita64bfd8)

 Conflicts:clang/lib/Analysis/UnsafeBufferUsage.cpp

…afety attributes are emitted in diagnostics (#10993)A recent auto-merged change from upstreamd9ef62aseemed to remove the special handling on how macro-defined bounds-safetyattributes are emitted in diagnostics. Adding the specialization for nowto fix the test failure. The task to clean up the special handling ofthe macro defined attributes is tracked separately.This fixes test failures in  Clang :: BoundsSafety/Sema/attributes_in_template_decls_attr_only_mode.cpp  Clang :: BoundsSafety/Sema/complex-typespecs-with-bounds.c  Clang :: BoundsSafety/Sema/terminated-by-attr.c  Clang :: BoundsSafety/Sema/unsafe-late-const.crdar://155652853