mirror of
https://github.com/JakeHillion/object-introspection.git
synced 2024-09-19 11:09:05 +01:00
89b230395f
Summary: tbv2: remove unnecessary copy in Element `IntrospectionResult::const_iterator` iterates through the `Element`s in an `IntrospectionResult`. `Element` currently copies the `type_path` which is a `std::vector<string_view>` every time the iterator is incremented. This is unnecessary as the data in the vector only changes slightly between iterations. This change changes the `type_path` field in `Element` to a `std::span<const std::string_view>`. Doing this previously caused SEGVs because of the iterator's potential to be copied. To make it possible we do two things: 1. Make all copies explicit using a clone interface as in `ContainerInfo`. This prevents accidental copies of an expensive structure. 2. After calling the copy constructor in `clone()` update the `span` in `next_` to point at the newly copied structure. Moves are fine because the `span` points at the allocation of the `vector`, not the vector itself. Test Plan: - CI - `FILTER='OilIntegration.*' make test` - Ran `OilgenIntegration.std_vector_vector_int_some` which SEGVd with the `span` change before and now doesn't. This now passes cleanly with ASAN enabled on the target, though isn't available in `main` (only works on my machine). Differential Revision: D53472595 Pulled By: JakeHillion
60 lines
1.5 KiB
C++
60 lines
1.5 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.
|
|
*/
|
|
#ifndef INCLUDED_OI_RESULT_ELEMENT_H
|
|
#define INCLUDED_OI_RESULT_ELEMENT_H 1
|
|
|
|
#include <optional>
|
|
#include <span>
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <variant>
|
|
#include <vector>
|
|
|
|
namespace oi::result {
|
|
|
|
struct Element {
|
|
struct ContainerStats {
|
|
size_t capacity;
|
|
size_t length;
|
|
};
|
|
struct IsSetStats {
|
|
bool is_set;
|
|
};
|
|
struct Pointer {
|
|
uintptr_t p;
|
|
};
|
|
struct Scalar {
|
|
uint64_t n;
|
|
};
|
|
|
|
std::string_view name;
|
|
std::span<const std::string_view> type_path;
|
|
std::span<const std::string_view> type_names;
|
|
size_t static_size;
|
|
size_t exclusive_size;
|
|
|
|
std::optional<uintptr_t> pointer;
|
|
std::variant<std::nullopt_t, Pointer, Scalar, std::string> data = {
|
|
std::nullopt};
|
|
std::optional<ContainerStats> container_stats;
|
|
std::optional<IsSetStats> is_set_stats;
|
|
bool is_primitive;
|
|
};
|
|
|
|
} // namespace oi::result
|
|
|
|
#endif
|