From 6dc5403c2f9c14ca5effac0a60c0494d4484aede Mon Sep 17 00:00:00 2001 From: 20083017 <651756340@qq.com> Date: Sun, 21 May 2023 17:01:27 +0800 Subject: [PATCH] llvm-16-compile-fix #168 --- llvm_propeller_profile_writer.cc | 7 +++---- llvm_propeller_whole_program_info.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/llvm_propeller_profile_writer.cc b/llvm_propeller_profile_writer.cc index 1a8b14f..1e1b4ad 100644 --- a/llvm_propeller_profile_writer.cc +++ b/llvm_propeller_profile_writer.cc @@ -81,7 +81,6 @@ void DumpCfgs( } // namespace namespace devtools_crosstool_autofdo { - using ::devtools_crosstool_autofdo::PropellerOptions; using ::llvm::StringRef; @@ -252,7 +251,7 @@ bool PropellerProfWriter::Write( total_clusters += func_cluster_info.clusters.size(); // Allocate the symbol order vector - std::vector, + std::vector, std::optional>>symbol_order(total_clusters); // Allocate the cold symbol order vector equally sized as // all_functions_cluster_info, as there is (at most) one cold cluster per @@ -272,7 +271,7 @@ bool PropellerProfWriter::Write( func_layout_info.optimized_score.inter_out_score; // Print all alias names of the function, separated by '/'. - out_stream << "!" << llvm::join(func_layout_info.cfg->names(), "/") << "\n"; + out_stream << "!" << ::llvm::join(func_layout_info.cfg->names(), "/") << "\n"; if (options_.verbose_cluster_output()) { // Print the layout score for intra-function and inter-function edges @@ -295,7 +294,7 @@ bool PropellerProfWriter::Write( // the function name is sufficient for section ordering. Otherwise, // the cluster number is required. symbol_order[cluster.layout_index] = - std::pair, std::optional>( + std::pair<::llvm::SmallVector, std::optional>( func_layout_info.cfg->names_, cluster.bb_indexes.front() == 0 ? std::optional() : cluster_id); diff --git a/llvm_propeller_whole_program_info.h b/llvm_propeller_whole_program_info.h index 5e9000f..7b8fd0c 100644 --- a/llvm_propeller_whole_program_info.h +++ b/llvm_propeller_whole_program_info.h @@ -76,7 +76,7 @@ class PropellerWholeProgramInfo : public AbstractPropellerWholeProgramInfo { bool binary_is_pie() const { return binary_perf_info_.binary_info.is_pie; } // Getters. - const string binary_build_id() const { + const std::string binary_build_id() const { return binary_perf_info_.binary_info.build_id; }