mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-23 19:23:23 +01:00
279a200561
That patch is the fix for https://bugs.llvm.org/show_bug.cgi?id=40703 "wrong line number info for obj file compiled with -ffunction-sections" bug. The problem happened with only .o files. If object file contains several .text sections then line number information showed incorrectly. The reason for this is that DwarfLineTable could not detect section which corresponds to specified address(because address is the local to the section). And as the result it could not select proper sequence in the line table. The fix is to pass SectionIndex with the address. So that it would be possible to differentiate addresses from various sections. With this fix llvm-objdump shows correct line numbers for disassembled code. Differential review: https://reviews.llvm.org/D58194 llvm-svn: 354972
76 lines
2.4 KiB
C++
76 lines
2.4 KiB
C++
//===- xray-fc-account.cpp: XRay Function Call Accounting Tool ------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Implementation of the helper tools dealing with XRay-generated function ids.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "func-id-helper.h"
|
|
#include "llvm/Support/Path.h"
|
|
#include <sstream>
|
|
|
|
using namespace llvm;
|
|
using namespace xray;
|
|
|
|
std::string FuncIdConversionHelper::SymbolOrNumber(int32_t FuncId) const {
|
|
auto CacheIt = CachedNames.find(FuncId);
|
|
if (CacheIt != CachedNames.end())
|
|
return CacheIt->second;
|
|
|
|
std::ostringstream F;
|
|
auto It = FunctionAddresses.find(FuncId);
|
|
if (It == FunctionAddresses.end()) {
|
|
F << "#" << FuncId;
|
|
return F.str();
|
|
}
|
|
|
|
object::SectionedAddress ModuleAddress;
|
|
ModuleAddress.Address = It->second;
|
|
// TODO: set proper section index here.
|
|
// object::SectionedAddress::UndefSection works for only absolute addresses.
|
|
ModuleAddress.SectionIndex = object::SectionedAddress::UndefSection;
|
|
if (auto ResOrErr = Symbolizer.symbolizeCode(BinaryInstrMap, ModuleAddress)) {
|
|
auto &DI = *ResOrErr;
|
|
if (DI.FunctionName == "<invalid>")
|
|
F << "@(" << std::hex << It->second << ")";
|
|
else
|
|
F << DI.FunctionName;
|
|
} else
|
|
handleAllErrors(ResOrErr.takeError(), [&](const ErrorInfoBase &) {
|
|
F << "@(" << std::hex << It->second << ")";
|
|
});
|
|
|
|
auto S = F.str();
|
|
CachedNames[FuncId] = S;
|
|
return S;
|
|
}
|
|
|
|
std::string FuncIdConversionHelper::FileLineAndColumn(int32_t FuncId) const {
|
|
auto It = FunctionAddresses.find(FuncId);
|
|
if (It == FunctionAddresses.end())
|
|
return "(unknown)";
|
|
|
|
std::ostringstream F;
|
|
object::SectionedAddress ModuleAddress;
|
|
ModuleAddress.Address = It->second;
|
|
// TODO: set proper section index here.
|
|
// object::SectionedAddress::UndefSection works for only absolute addresses.
|
|
ModuleAddress.SectionIndex = object::SectionedAddress::UndefSection;
|
|
auto ResOrErr = Symbolizer.symbolizeCode(BinaryInstrMap, ModuleAddress);
|
|
if (!ResOrErr) {
|
|
consumeError(ResOrErr.takeError());
|
|
return "(unknown)";
|
|
}
|
|
|
|
auto &DI = *ResOrErr;
|
|
F << sys::path::filename(DI.FileName).str() << ":" << DI.Line << ":"
|
|
<< DI.Column;
|
|
|
|
return F.str();
|
|
}
|