From 574a18e0138d40da4c1335a0730f48a5538b51d7 Mon Sep 17 00:00:00 2001 From: 5c4lar Date: Thu, 11 Apr 2024 11:44:29 +0000 Subject: [PATCH] add gtirb namespace for casts --- src/gtirb-decoder/core/AuxDataLoader.cpp | 6 +++--- src/gtirb-decoder/core/EdgesLoader.cpp | 6 +++--- src/passes/Disassembler.cpp | 10 +++++----- src/passes/NoReturnPass.cpp | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gtirb-decoder/core/AuxDataLoader.cpp b/src/gtirb-decoder/core/AuxDataLoader.cpp index 3fc7c2137..8d7c704cb 100644 --- a/src/gtirb-decoder/core/AuxDataLoader.cpp +++ b/src/gtirb-decoder/core/AuxDataLoader.cpp @@ -34,7 +34,7 @@ void PaddingLoader::operator()(const gtirb::Module& Module, souffle::SouffleProg for(auto& [Offset, Size] : *Table) { - auto* ByteInterval = dyn_cast_or_null( + auto* ByteInterval = gtirb::dyn_cast_or_null( gtirb::Node::getByUUID(*Context, Offset.ElementId)); assert(ByteInterval && "Failed to find ByteInterval by UUID."); if(ByteInterval->getAddress()) @@ -57,7 +57,7 @@ void FdeEntriesLoader::operator()(const gtirb::Module& Module, souffle::SouffleP for(auto& Pair : *CfiDirectives) { - auto* Block = dyn_cast_or_null( + auto* Block = gtirb::dyn_cast_or_null( gtirb::Node::getByUUID(*Context, Pair.first.ElementId)); assert(Block && "Found CFI directive that does not belong to a block"); @@ -104,7 +104,7 @@ void FunctionEntriesLoader::operator()(const gtirb::Module& Module, for(auto& UUID : Pair.second) { auto* Block = - dyn_cast_or_null(gtirb::Node::getByUUID(*Context, UUID)); + gtirb::dyn_cast_or_null(gtirb::Node::getByUUID(*Context, UUID)); assert(Block && "Found function entry does not belong to a code block"); assert(Block->getAddress() && "Found code block without address."); Functions.push_back(*Block->getAddress()); diff --git a/src/gtirb-decoder/core/EdgesLoader.cpp b/src/gtirb-decoder/core/EdgesLoader.cpp index c9b66892b..05f8fc042 100644 --- a/src/gtirb-decoder/core/EdgesLoader.cpp +++ b/src/gtirb-decoder/core/EdgesLoader.cpp @@ -118,7 +118,7 @@ void CfgLoader(const gtirb::Module& Module, souffle::SouffleProgram& Program) { auto Source = boost::source(Edge, Cfg); auto Target = boost::target(Edge, Cfg); - if(const gtirb::CodeBlock* Src = dyn_cast(Cfg[Source])) + if(const gtirb::CodeBlock* Src = gtirb::dyn_cast(Cfg[Source])) { std::optional SrcAddr = Src->getAddress(); assert(SrcAddr && "Found source block without address."); @@ -126,14 +126,14 @@ void CfgLoader(const gtirb::Module& Module, souffle::SouffleProgram& Program) const gtirb::EdgeLabel& Label = Cfg[Edge]; auto [Conditional, Indirect, Type] = edgeProperties(Label); - if(const gtirb::CodeBlock* Dest = dyn_cast(Cfg[Target])) + if(const gtirb::CodeBlock* Dest = gtirb::dyn_cast(Cfg[Target])) { std::optional DestAddr = Dest->getAddress(); assert(DestAddr && "Found destination block without address."); Edges.push_back({*SrcAddr, *DestAddr, Conditional, Indirect, Type}); } - if(const gtirb::ProxyBlock* Dest = dyn_cast(Cfg[Target])) + if(const gtirb::ProxyBlock* Dest = gtirb::dyn_cast(Cfg[Target])) { auto It = InvSymbolMap.find(Dest); if(It != InvSymbolMap.end()) diff --git a/src/passes/Disassembler.cpp b/src/passes/Disassembler.cpp index 4efafea78..46a55b84e 100644 --- a/src/passes/Disassembler.cpp +++ b/src/passes/Disassembler.cpp @@ -320,7 +320,7 @@ void removeSectionSymbols(gtirb::Context &Context, gtirb::Module &Module) for(const auto Uuid : Remove) { gtirb::Node *N = gtirb::Node::getByUUID(Context, Uuid); - if(auto *Symbol = dyn_cast_or_null(N)) + if(auto *Symbol = gtirb::dyn_cast_or_null(N)) { Module.removeSymbol(Symbol); SymbolInfo->erase(Uuid); @@ -864,7 +864,7 @@ void connectSymbolsToBlocks(gtirb::Context &Context, gtirb::Module &Module, if(SectionIndex == SHN_COMMON) { gtirb::Node *Node = gtirb::Node::getByUUID(Context, Uuid); - if(auto *Symbol = dyn_cast_or_null(Node); + if(auto *Symbol = gtirb::dyn_cast_or_null(Node); Symbol && Symbol->getAddress()) { // Alignment is stored in the symbol's value field. @@ -977,12 +977,12 @@ void connectSymbolsToBlocks(gtirb::Context &Context, gtirb::Module &Module, for(auto [Symbol, T] : ConnectToBlock) { auto [Node, AtEnd] = T; - if(gtirb::CodeBlock *CodeBlock = dyn_cast_or_null(Node)) + if(gtirb::CodeBlock *CodeBlock = gtirb::dyn_cast_or_null(Node)) { Symbol->setReferent(CodeBlock); Symbol->setAtEnd(AtEnd); } - else if(gtirb::DataBlock *DataBlock = dyn_cast_or_null(Node)) + else if(gtirb::DataBlock *DataBlock = gtirb::dyn_cast_or_null(Node)) { Symbol->setReferent(DataBlock); Symbol->setAtEnd(AtEnd); @@ -995,7 +995,7 @@ void connectSymbolsToBlocks(gtirb::Context &Context, gtirb::Module &Module, for(auto Forward : *SymbolForwarding) { gtirb::Node *Node = gtirb::Node::getByUUID(Context, std::get<1>(Forward)); - if(auto *Symbol = dyn_cast_or_null(Node)) + if(auto *Symbol = gtirb::dyn_cast_or_null(Node)) { if(Symbol->hasReferent()) { diff --git a/src/passes/NoReturnPass.cpp b/src/passes/NoReturnPass.cpp index b11329d3d..05a07b4d3 100644 --- a/src/passes/NoReturnPass.cpp +++ b/src/passes/NoReturnPass.cpp @@ -46,7 +46,7 @@ void NoReturnPass::transformImpl(AnalysisPassResult& Result, gtirb::Context& Con boost::remove_edge_if( [&](auto Edge) { gtirb::EdgeLabel Label = *static_cast(Edge.get_property()); - if(auto* Block = dyn_cast(Cfg[Edge.m_source])) + if(auto* Block = gtirb::dyn_cast(Cfg[Edge.m_source])) return NoReturn.count(Block) && Label && std::get(*Label) == gtirb::EdgeType::Fallthrough; return false;