From 9855818bb81dfda5a601095a5520edfc5580acd6 Mon Sep 17 00:00:00 2001 From: Jon Ross-Perkins Date: Thu, 26 Jun 2025 11:39:54 -0700 Subject: [PATCH] Move PrettyStackTraceFunction to common (#5739) I'm looking at using this as part of file_test to dump streaming, related to #5733 --- common/BUILD | 8 ++++++++ {toolchain/base => common}/pretty_stack_trace_function.h | 6 +++--- toolchain/base/BUILD | 8 -------- toolchain/check/BUILD | 2 +- toolchain/check/check_unit.cpp | 2 +- toolchain/driver/BUILD | 2 +- toolchain/driver/compile_subcommand.cpp | 2 +- toolchain/driver/driver.cpp | 2 +- toolchain/lower/BUILD | 2 +- toolchain/lower/file_context.cpp | 2 +- toolchain/lower/function_context.cpp | 2 +- toolchain/parse/BUILD | 2 +- toolchain/parse/parse.cpp | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) rename {toolchain/base => common}/pretty_stack_trace_function.h (79%) diff --git a/common/BUILD b/common/BUILD index 032b1a17a6ca..9fb63616e6a1 100644 --- a/common/BUILD +++ b/common/BUILD @@ -405,6 +405,14 @@ cc_library( ], ) +cc_library( + name = "pretty_stack_trace_function", + hdrs = ["pretty_stack_trace_function.h"], + deps = [ + "@llvm-project//llvm:Support", + ], +) + cc_library( name = "raw_hashtable", srcs = ["raw_hashtable.cpp"], diff --git a/toolchain/base/pretty_stack_trace_function.h b/common/pretty_stack_trace_function.h similarity index 79% rename from toolchain/base/pretty_stack_trace_function.h rename to common/pretty_stack_trace_function.h index 8317f0a9c628..f4b68a61eb46 100644 --- a/toolchain/base/pretty_stack_trace_function.h +++ b/common/pretty_stack_trace_function.h @@ -2,8 +2,8 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#ifndef CARBON_TOOLCHAIN_BASE_PRETTY_STACK_TRACE_FUNCTION_H_ -#define CARBON_TOOLCHAIN_BASE_PRETTY_STACK_TRACE_FUNCTION_H_ +#ifndef CARBON_COMMON_PRETTY_STACK_TRACE_FUNCTION_H_ +#define CARBON_COMMON_PRETTY_STACK_TRACE_FUNCTION_H_ #include @@ -26,4 +26,4 @@ class PrettyStackTraceFunction : public llvm::PrettyStackTraceEntry { } // namespace Carbon -#endif // CARBON_TOOLCHAIN_BASE_PRETTY_STACK_TRACE_FUNCTION_H_ +#endif // CARBON_COMMON_PRETTY_STACK_TRACE_FUNCTION_H_ diff --git a/toolchain/base/BUILD b/toolchain/base/BUILD index 0e4979728118..0b8665823d9d 100644 --- a/toolchain/base/BUILD +++ b/toolchain/base/BUILD @@ -45,14 +45,6 @@ cc_test( ], ) -cc_library( - name = "pretty_stack_trace_function", - hdrs = ["pretty_stack_trace_function.h"], - deps = [ - "@llvm-project//llvm:Support", - ], -) - cc_library( name = "mem_usage", hdrs = ["mem_usage.h"], diff --git a/toolchain/check/BUILD b/toolchain/check/BUILD index 8010240cbf7f..661d6639d999 100644 --- a/toolchain/check/BUILD +++ b/toolchain/check/BUILD @@ -186,9 +186,9 @@ cc_library( "//common:growing_range", "//common:map", "//common:ostream", + "//common:pretty_stack_trace_function", "//common:vlog", "//toolchain/base:kind_switch", - "//toolchain/base:pretty_stack_trace_function", "//toolchain/base:shared_value_stores", "//toolchain/base:timings", "//toolchain/diagnostics:diagnostic_emitter", diff --git a/toolchain/check/check_unit.cpp b/toolchain/check/check_unit.cpp index 6185043118b1..08419d62c01e 100644 --- a/toolchain/check/check_unit.cpp +++ b/toolchain/check/check_unit.cpp @@ -10,11 +10,11 @@ #include #include "common/growing_range.h" +#include "common/pretty_stack_trace_function.h" #include "llvm/ADT/IntrusiveRefCntPtr.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/VirtualFileSystem.h" #include "toolchain/base/kind_switch.h" -#include "toolchain/base/pretty_stack_trace_function.h" #include "toolchain/check/diagnostic_helpers.h" #include "toolchain/check/generic.h" #include "toolchain/check/handle.h" diff --git a/toolchain/driver/BUILD b/toolchain/driver/BUILD index 9913a85fe02a..a965e9347706 100644 --- a/toolchain/driver/BUILD +++ b/toolchain/driver/BUILD @@ -121,11 +121,11 @@ cc_library( "//common:command_line", "//common:error", "//common:ostream", + "//common:pretty_stack_trace_function", "//common:raw_string_ostream", "//common:version", "//common:vlog", "//toolchain/base:llvm_tools", - "//toolchain/base:pretty_stack_trace_function", "//toolchain/base:shared_value_stores", "//toolchain/base:timings", "//toolchain/check", diff --git a/toolchain/driver/compile_subcommand.cpp b/toolchain/driver/compile_subcommand.cpp index 807822505381..4f93fac2e5f3 100644 --- a/toolchain/driver/compile_subcommand.cpp +++ b/toolchain/driver/compile_subcommand.cpp @@ -11,10 +11,10 @@ #include #include +#include "common/pretty_stack_trace_function.h" #include "common/vlog.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/ScopeExit.h" -#include "toolchain/base/pretty_stack_trace_function.h" #include "toolchain/base/timings.h" #include "toolchain/check/check.h" #include "toolchain/codegen/codegen.h" diff --git a/toolchain/driver/driver.cpp b/toolchain/driver/driver.cpp index 2e4eb43655d0..7a432c8b13f9 100644 --- a/toolchain/driver/driver.cpp +++ b/toolchain/driver/driver.cpp @@ -9,8 +9,8 @@ #include #include "common/command_line.h" +#include "common/pretty_stack_trace_function.h" #include "common/version.h" -#include "toolchain/base/pretty_stack_trace_function.h" #include "toolchain/driver/clang_subcommand.h" #include "toolchain/driver/compile_subcommand.h" #include "toolchain/driver/format_subcommand.h" diff --git a/toolchain/lower/BUILD b/toolchain/lower/BUILD index 62ddce5c696d..7fccc0277956 100644 --- a/toolchain/lower/BUILD +++ b/toolchain/lower/BUILD @@ -51,11 +51,11 @@ cc_library( "//common:check", "//common:growing_range", "//common:map", + "//common:pretty_stack_trace_function", "//common:raw_string_ostream", "//common:vlog", "//toolchain/base:fixed_size_value_store", "//toolchain/base:kind_switch", - "//toolchain/base:pretty_stack_trace_function", "//toolchain/parse:tree", "//toolchain/sem_ir:absolute_node_id", "//toolchain/sem_ir:diagnostic_loc_converter", diff --git a/toolchain/lower/file_context.cpp b/toolchain/lower/file_context.cpp index 928062b8b4f7..c657881699d7 100644 --- a/toolchain/lower/file_context.cpp +++ b/toolchain/lower/file_context.cpp @@ -11,6 +11,7 @@ #include "clang/CodeGen/ModuleBuilder.h" #include "common/check.h" +#include "common/pretty_stack_trace_function.h" #include "common/vlog.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/Sequence.h" @@ -18,7 +19,6 @@ #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Transforms/Utils/ModuleUtils.h" #include "toolchain/base/kind_switch.h" -#include "toolchain/base/pretty_stack_trace_function.h" #include "toolchain/lower/constant.h" #include "toolchain/lower/function_context.h" #include "toolchain/lower/mangler.h" diff --git a/toolchain/lower/function_context.cpp b/toolchain/lower/function_context.cpp index f8a4a1e1b964..b78bc7098db1 100644 --- a/toolchain/lower/function_context.cpp +++ b/toolchain/lower/function_context.cpp @@ -4,9 +4,9 @@ #include "toolchain/lower/function_context.h" +#include "common/pretty_stack_trace_function.h" #include "common/vlog.h" #include "toolchain/base/kind_switch.h" -#include "toolchain/base/pretty_stack_trace_function.h" #include "toolchain/sem_ir/diagnostic_loc_converter.h" #include "toolchain/sem_ir/file.h" #include "toolchain/sem_ir/generic.h" diff --git a/toolchain/parse/BUILD b/toolchain/parse/BUILD index e6455f76a14c..39454a50361e 100644 --- a/toolchain/parse/BUILD +++ b/toolchain/parse/BUILD @@ -106,7 +106,7 @@ cc_library( ":tree", "//common:check", "//common:ostream", - "//toolchain/base:pretty_stack_trace_function", + "//common:pretty_stack_trace_function", "//toolchain/base:shared_value_stores", "//toolchain/diagnostics:diagnostic_emitter", "//toolchain/diagnostics:format_providers", diff --git a/toolchain/parse/parse.cpp b/toolchain/parse/parse.cpp index b4368f7ff11c..b7c3f996fb04 100644 --- a/toolchain/parse/parse.cpp +++ b/toolchain/parse/parse.cpp @@ -5,7 +5,7 @@ #include "toolchain/parse/parse.h" #include "common/check.h" -#include "toolchain/base/pretty_stack_trace_function.h" +#include "common/pretty_stack_trace_function.h" #include "toolchain/parse/context.h" #include "toolchain/parse/handle.h" #include "toolchain/parse/node_kind.h"