Skip to content

Upgrade magic_enum to fix builds for clang v16 and later #2299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddelnano merged 1 commit into from
Dec 16, 2025
Merged

Upgrade magic_enum to fix builds for clang v16 and later #2299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/nats-io/nats.c/archive/refs/tags/v3.3.0.tar.gz"],
),
com_github_neargye_magic_enum = dict(
sha256 = "4fe6627407a656d0d73879c0346b251ccdcfb718c37bef5410ba172c7c7d5f9a",
strip_prefix = "magic_enum-0.7.0",
urls = ["https://github.com/Neargye/magic_enum/archive/refs/tags/v0.7.0.tar.gz"],
sha256 = "b403d3dad4ef542fdc3024fa37d3a6cedb4ad33c72e31b6d9bab89dcaf69edf7",
strip_prefix = "magic_enum-0.9.7",
urls = ["https://github.com/Neargye/magic_enum/archive/refs/tags/v0.9.7.tar.gz"],
),
com_github_nlohmann_json = dict(
sha256 = "87b5884741427220d3a33df1363ae0e8b898099fbc59f1c451113f6732891014",
Expand Down
2 changes: 1 addition & 1 deletion src/carnot/exec/agg_node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <algorithm>
#include <cstdint>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/carnot/exec/expression_evaluator.h"
#include "src/carnot/plan/scalar_expression.h"
Expand Down
2 changes: 1 addition & 1 deletion src/carnot/exec/udtf_source_node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <string_view>
#include <vector>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/carnot/plan/scalar_expression.h"
#include "src/carnot/udf/registry.h"
Expand Down
2 changes: 1 addition & 1 deletion src/carnot/plan/operators.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <absl/strings/str_join.h>
#include <absl/strings/substitute.h>
#include <google/protobuf/text_format.h>
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/carnot/plan/scalar_expression.h"
#include "src/carnot/planpb/plan.pb.h"
Expand Down
2 changes: 1 addition & 1 deletion src/carnot/plan/plan_fragment.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include <absl/strings/str_cat.h>
#include <absl/strings/substitute.h>
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/carnot/dag/dag.h"
#include "src/carnot/planpb/plan.pb.h"
Expand Down
2 changes: 1 addition & 1 deletion src/carnot/planner/parser/parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <utility>
#include <vector>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
#include <pypa/ast/ast.hh>
#include <pypa/ast/tree_walker.hh>
#include <pypa/parser/parser.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/common/base/enum_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <map>
#include <utility>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

namespace px {

Expand Down
2 changes: 1 addition & 1 deletion src/common/base/error.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <string>

#include <absl/strings/substitute.h>
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/common/base/status.h"
#include "src/common/base/statuspb/status.pb.h"
Expand Down
2 changes: 1 addition & 1 deletion src/common/base/magic_enum_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <magic_enum.hpp>
#include <magic_enum/magic_enum_all.hpp>
#include "src/common/testing/testing.h"

// The following test cases are mostly from MagicEnum docs: https://github.com/Neargye/magic_enum.
Expand Down
2 changes: 1 addition & 1 deletion src/common/base/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <utility>
#include <vector>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include <absl/strings/str_format.h>
#include "src/common/base/error.h"
Expand Down
2 changes: 1 addition & 1 deletion src/integrations/grpc_clocksync/grpc_clock_converter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <string>
#include <vector>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
#include "src/common/clock/clock_conversion.h"
#include "src/integrations/grpc_clocksync/proto/clocksync.grpc.pb.h"

Expand Down
2 changes: 1 addition & 1 deletion src/shared/types/typespb/wrapper/types_pb_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#pragma once

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/shared/types/typespb/types.pb.h"

Expand Down
2 changes: 1 addition & 1 deletion src/stirling/bpf_tools/bcc_wrapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <iostream>
#include <string>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/common/base/base.h"
#include "src/common/fs/fs_wrapper.h"
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/bpf_tools/probe_specs/probe_specs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <memory>
#include <string>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/common/base/base.h"
#include "src/common/json/json.h"
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/core/source_connector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <ctime>
#include <memory>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/stirling/core/source_connector.h"

Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/bcc_bpf_intf/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <string>

#include <absl/strings/substitute.h>
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/common/base/enum_utils.h"
#include "src/stirling/source_connectors/socket_tracer/bcc_bpf_intf/common.h"
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/bcc_bpf_intf/go_grpc_types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <algorithm>
#include <string>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/common/base/base.h"
#include "src/stirling/source_connectors/socket_tracer/bcc_bpf_intf/common.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/bcc_bpf_intf/protocols_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <absl/strings/str_replace.h>
#include <gtest/gtest.h>
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/common/base/base.h"

Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/conn_tracker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <vector>

#include <absl/strings/numbers.h>
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/common/base/inet_utils.h"
#include "src/common/system/proc_pid_path.h"
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/conn_tracker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <variant>
#include <vector>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/common/system/proc_parser.h"
#include "src/common/system/socket_info.h"
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/conn_tracker_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <gtest/gtest.h>
#include <sys/socket.h>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "protocols/http/types.h"
#include "src/common/testing/testing.h"
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/metrics.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <unordered_map>
#include <utility>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/stirling/source_connectors/socket_tracer/metrics.h"

Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/protocols/cql/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <optional>
#include <string>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/stirling/source_connectors/socket_tracer/protocols/common/event_parser.h" // For FrameBase.

Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/protocols/dns/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <utility>
#include <vector>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/stirling/source_connectors/socket_tracer/protocols/common/event_parser.h" // For FrameBase.

Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/protocols/kafka/common/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <utility>
#include <vector>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/common/base/base.h"
#include "src/stirling/source_connectors/socket_tracer/protocols/common/event_parser.h" // For FrameBase
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/protocols/mux/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <utility>

#include <absl/container/flat_hash_map.h>
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/stirling/source_connectors/socket_tracer/protocols/common/event_parser.h"
#include "src/stirling/utils/utils.h"
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/protocols/mysql/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <utility>
#include <vector>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/common/base/base.h"
#include "src/stirling/source_connectors/socket_tracer/protocols/common/event_parser.h" // For FrameBase
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/protocols/pgsql/parse.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <utility>

#include <absl/strings/ascii.h>
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/common/base/base.h"
#include "src/stirling/utils/binary_decoder.h"
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/protocols/tls/parse.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <utility>
#include <vector>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/stirling/utils/binary_decoder.h"

Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/socket_trace_bpf_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <string_view>
#include <thread>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/common/fs/temp_file.h"
#include "src/common/system/clock.h"
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/socket_tracer/socket_trace_connector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <absl/strings/match.h>
#include <google/protobuf/text_format.h>
#include <google/protobuf/util/delimited_message_util.h>
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
#include "src/common/system/kernel_version.h"

#include "src/common/base/base.h"
Expand Down
5 changes: 2 additions & 3 deletions src/stirling/source_connectors/socket_tracer/socket_trace_connector_benchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <absl/container/flat_hash_set.h>
#include <absl/strings/str_split.h>
#include <benchmark/benchmark.h>
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/common/perf/memory_tracker.h"
#include "src/common/perf/tcmalloc.h"
Expand Down Expand Up @@ -91,8 +91,7 @@ px::StatusOr<absl::flat_hash_set<DisplayStatCategory>> GetDisplayStatCategories(
absl::flat_hash_set<DisplayStatCategory> categories;
auto case_insensitive_cmp = [](char a, char b) { return tolower(a) == tolower(b); };
for (std::string_view category_str : absl::StrSplit(FLAGS_display, ",")) {
auto cast_opt = magic_enum::enum_cast<DisplayStatCategory, decltype(case_insensitive_cmp)>(
category_str, case_insensitive_cmp);
auto cast_opt = magic_enum::enum_cast<DisplayStatCategory>(category_str, case_insensitive_cmp);
if (!cast_opt.has_value()) {
return px::error::InvalidArgument("Invalid DisplayStatCategory: ", category_str);
}
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/source_connectors/stirling_error/stirling_error_connector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/common/base/base.h"
#include "src/common/system/proc_parser.h"
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/testing/overloads.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#pragma once

#include <absl/strings/substitute.h>
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/stirling/utils/monitor.h"
#include "src/stirling/utils/tcp_stats.h"
Expand Down
6 changes: 4 additions & 2 deletions src/stirling/utils/enum_map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@
#include <vector>

#include <absl/container/flat_hash_set.h>
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/common/base/base.h"

namespace px {
namespace stirling {
namespace utils {

using magic_enum::as_common;

/**
* A map-like data structure backed by vector. The key type must be enum type.
* NOTE: This does not work for bool as value type, as the std::vector<bool> is specialized and is
Expand All @@ -38,7 +40,7 @@ namespace utils {
template <typename TEnumKeyType, typename TValueType>
class EnumMap {
public:
EnumMap() : values_(magic_enum::detail::reflected_max_v<TEnumKeyType>) {}
EnumMap() : values_(magic_enum::detail::reflected_max<TEnumKeyType, as_common<>>()) {}

bool Set(TEnumKeyType key, TValueType value) {
if (set_keys_.contains(key)) {
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/utils/stat_counter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <absl/strings/str_cat.h>
#include <absl/strings/substitute.h>

#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

namespace px {
namespace stirling {
Expand Down
2 changes: 1 addition & 1 deletion src/vizier/funcs/md_udtfs/md_udtfs_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#include <absl/numeric/int128.h>
#include <grpcpp/grpcpp.h>
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>

#include "src/carnot/udf/registry.h"
#include "src/carnot/udf/udf.h"
Expand Down
Loading