From e09a1b51ab04b0d6d1d4ba5425f75a04d6b3a13d Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Thu, 27 Jul 2023 19:59:26 -0700 Subject: [MCDisassembler] Reorder XCOFF specific constructor parameters. NFC to prevent overload resolution confusion. In particular, if we add another parameter to the generic constructor, MCDisassemblerTest.cpp specified constructors will be resolve to the generic constructor, which is unintended. --- llvm/tools/llvm-objdump/llvm-objdump.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp') diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index 98de0fa..edf36eb 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -1210,7 +1210,7 @@ SymbolInfoTy objdump::createSymbolInfo(const ObjectFile &Obj, const uint32_t SymbolIndex = XCOFFObj.getSymbolIndex(SymbolDRI.p); std::optional Smc = getXCOFFSymbolCsectSMC(XCOFFObj, Symbol); - return SymbolInfoTy(Addr, Name, Smc, SymbolIndex, + return SymbolInfoTy(Smc, Addr, Name, SymbolIndex, isLabel(XCOFFObj, Symbol)); } else if (Obj.isXCOFF()) { const SymbolRef::Type SymType = unwrapOrError(Symbol.getType(), FileName); @@ -1225,7 +1225,7 @@ static SymbolInfoTy createDummySymbolInfo(const ObjectFile &Obj, const uint64_t Addr, StringRef &Name, uint8_t Type) { if (Obj.isXCOFF() && (SymbolDescription || TracebackTable)) - return SymbolInfoTy(Addr, Name, std::nullopt, std::nullopt, false); + return SymbolInfoTy(std::nullopt, Addr, Name, std::nullopt, false); else return SymbolInfoTy(Addr, Name, Type); } -- cgit v1.1