mirror of
https://github.com/JakeHillion/object-introspection.git
synced 2024-09-19 11:09:05 +01:00
31ba8659f0
A previous change enabled running OIL tests with specific features enabled. This highlighted that pointer code generation under TreeBuilder-v2 was very broken. This change updates pointer code generation to work and enables the skipped tests. All enabled tests need `expected_json_v2` added to them due to formatting differences. Reformatted and rewrote the basic type handler that handles primitives and pointers. Removed the reliance on `features` to decide whether to generate for TreeBuilder-v2 as the intermediate features have been removed. Pointers are treated as containers with a capacity of 1 and a length of 0 if null/a cycle and 1 if followed. This holds for void pointers where, although they aren't followed, the length is still set. There were a couple of other changes needed to enable these tests on TBv2 that aren't worth their own issues and PRs, I sneaked them in here. Extra changes: - Added `Pointer` and `Reference` to TopoSorter so they generate `NameProvider` instances. It might be worth visiting the graph differently for `NameProvider` as it requires so many instances that others generators do not. Will consider that in the future. - Follow typedefs when calculating exclusive size for a type. Closes #458. Test plan: - CI - Enabled previously disabled tests.
65 lines
1.8 KiB
C++
65 lines
1.8 KiB
C++
/*
|
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
#pragma once
|
|
|
|
#include <queue>
|
|
#include <unordered_set>
|
|
#include <vector>
|
|
|
|
#include "PassManager.h"
|
|
#include "Types.h"
|
|
#include "Visitor.h"
|
|
|
|
namespace oi::detail::type_graph {
|
|
|
|
/*
|
|
* TopoSorter
|
|
*
|
|
* Topologically sorts a list of types so that dependencies appear before
|
|
* dependent types.
|
|
*/
|
|
class TopoSorter : public RecursiveVisitor {
|
|
public:
|
|
static Pass createPass();
|
|
|
|
void sort(const std::vector<std::reference_wrapper<Type>>& types);
|
|
const std::vector<std::reference_wrapper<Type>>& sortedTypes() const;
|
|
|
|
using RecursiveVisitor::accept;
|
|
|
|
void accept(Type& type) override;
|
|
void visit(Class& c) override;
|
|
void visit(Container& c) override;
|
|
void visit(Enum& e) override;
|
|
void visit(Typedef& td) override;
|
|
void visit(Pointer& p) override;
|
|
void visit(Reference& r) override;
|
|
void visit(Primitive& p) override;
|
|
void visit(CaptureKeys& p) override;
|
|
void visit(Incomplete& i) override;
|
|
void visit(Array& i) override;
|
|
|
|
private:
|
|
std::unordered_set<Type*> visited_;
|
|
std::vector<std::reference_wrapper<Type>> sortedTypes_;
|
|
std::queue<std::reference_wrapper<Type>> typesToSort_;
|
|
|
|
void acceptAfter(Type& type);
|
|
void acceptAfter(Type* type);
|
|
};
|
|
|
|
} // namespace oi::detail::type_graph
|