JakeHillion/object-introspection
1
0
Fork 0
mirror of https://github.com/JakeHillion/object-introspection.git synced 2024-09-19 11:09:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

CodeGen: Store list of ContainerInfos in unique_ptrs for reference stability

Browse Source 
Lots of places rely on reference stability of ContainerInfo objects
(CodeGen's deduplication, Container nodes' containerInfo_ member).

In the key capture work, we need to be able to append to this list,
which would invalidate references before this change.
This commit is contained in:
Alastair Robertson 2023-09-22 08:35:12 -07:00 committed by Alastair Robertson
parent 5632738d97
commit bd826f9794
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oi/CodeGen.cpp
View File

@ -1061,8 +1061,9 @@ bool CodeGen::codegenFromDrgn(struct drgn_type* drgnType, std::string& code) {
}
void CodeGen::registerContainer(const fs::path& path) {
const auto& info = containerInfos_.emplace_back(path);
VLOG(1) << "Registered container: " << info.typeName;
auto info = std::make_unique<ContainerInfo>(path);
VLOG(1) << "Registered container: " << info->typeName;
containerInfos_.emplace_back(std::move(info));
}
void CodeGen::addDrgnRoot(struct drgn_type* drgnType, TypeGraph& typeGraph) {

3
oi/CodeGen.h
View File

@ -17,6 +17,7 @@
#include <filesystem>
#include <functional>
#include <memory>
#include <string>
#include <unordered_map>
#include <unordered_set>
@ -65,7 +66,7 @@ class CodeGen {
private:
const OICodeGen::Config& config_;
SymbolService& symbols_;
std::vector<ContainerInfo> containerInfos_;
std::vector<std::unique_ptr<ContainerInfo>> containerInfos_;
std::unordered_set<const ContainerInfo*> definedContainers_;
std::unordered_map<const type_graph::Class*, const type_graph::Member*>
thriftIssetMembers_;

6
oi/type_graph/DrgnParser.cpp
View File

@ -138,13 +138,13 @@ Container* DrgnParser::enumerateContainer(struct drgn_type* type,
auto size = get_drgn_type_size(type);
for (const auto& containerInfo : containers_) {
if (!std::regex_search(fqName, containerInfo.matcher)) {
if (!std::regex_search(fqName, containerInfo->matcher)) {
continue;
}
VLOG(2) << "Matching container `" << containerInfo.typeName << "` from `"
VLOG(2) << "Matching container `" << containerInfo->typeName << "` from `"
<< fqName << "`" << std::endl;
auto& c = makeType<Container>(type, containerInfo, size);
auto& c = makeType<Container>(type, *containerInfo, size);
enumerateClassTemplateParams(type, c.templateParams);
return &c;
}

5
oi/type_graph/DrgnParser.h
View File

@ -15,6 +15,7 @@
*/
#pragma once
#include <memory>
#include <unordered_map>
#include <vector>
@ -53,7 +54,7 @@ struct DrgnParserOptions {
class DrgnParser {
public:
DrgnParser(TypeGraph& typeGraph,
const std::vector<ContainerInfo>& containers,
const std::vector<std::unique_ptr<ContainerInfo>>& containers,
DrgnParserOptions options)
: typeGraph_(typeGraph), containers_(containers), options_(options) {
}
@ -97,7 +98,7 @@ class DrgnParser {
drgn_types_;
TypeGraph& typeGraph_;
const std::vector<ContainerInfo>& containers_;
const std::vector<std::unique_ptr<ContainerInfo>>& containers_;
int depth_;
DrgnParserOptions options_;
};

9
test/test_drgn_parser.cpp
View File

@ -21,13 +21,14 @@ using ::testing::HasSubstr;
SymbolService* DrgnParserTest::symbols_ = nullptr;
namespace {
const std::vector<ContainerInfo>& getContainerInfos() {
const std::vector<std::unique_ptr<ContainerInfo>>& getContainerInfos() {
static auto res = []() {
// TODO more container types, with various template parameter options
ContainerInfo std_vector{"std::vector", SEQ_TYPE, "vector"};
std_vector.stubTemplateParams = {1};
auto std_vector =
std::make_unique<ContainerInfo>("std::vector", SEQ_TYPE, "vector");
std_vector->stubTemplateParams = {1};
std::vector<ContainerInfo> containers;
std::vector<std::unique_ptr<ContainerInfo>> containers;
containers.emplace_back(std::move(std_vector));
return containers;
}();