diff options
Diffstat (limited to 'contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime')
3 files changed, 11 insertions, 12 deletions
diff --git a/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp b/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp index 7078c059adc7..2430ec3ff5d4 100644 --- a/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp +++ b/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp @@ -8,7 +8,6 @@ #include <string> -#include "llvm/ADT/None.h" #include "llvm/ADT/StringRef.h" #include "llvm/IR/Instruction.h" #include "llvm/IR/Instructions.h" @@ -49,7 +48,7 @@ static bool registerRSDefaultTargetOpts(clang::TargetOptions &proto, proto.CPU = "atom"; proto.Features.push_back("+long64"); // Fallthrough for common x86 family features - LLVM_FALLTHROUGH; + [[fallthrough]]; case llvm::Triple::ArchType::x86_64: proto.Features.push_back("+mmx"); proto.Features.push_back("+sse"); @@ -92,7 +91,7 @@ bool RenderScriptRuntimeModulePass::runOnModule(llvm::Module &module) { return false; } - llvm::Optional<llvm::Reloc::Model> reloc_model = llvm::None; + std::optional<llvm::Reloc::Model> reloc_model; assert(m_process_ptr && "no available lldb process"); switch (m_process_ptr->GetTarget().GetArchitecture().GetMachine()) { case llvm::Triple::ArchType::x86: @@ -175,7 +174,6 @@ bool RenderScriptRuntime::GetIRPasses(LLVMUserExpression::IRPasses &passes) { namespace lldb_renderscript { RSIRPasses::RSIRPasses(Process *process) { - IRPasses(); assert(process); EarlyPasses = std::make_shared<llvm::legacy::PassManager>(); diff --git a/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp b/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp index 0c032f8a7c88..e168241fb2c9 100644 --- a/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp +++ b/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp @@ -577,7 +577,7 @@ struct RenderScriptRuntime::Element { array_size; // Number of items in array, only needed for structs ConstString type_name; // Name of type, only needed for structs - static ConstString + static ConstString GetFallbackStructName(); // Print this as the type name of a struct Element // If we can't resolve the actual struct name @@ -879,7 +879,7 @@ RSReduceBreakpointResolver::SearchCallback(lldb_private::SearchFilter &filter, LLDB_LOGF(log, "%s: %s reduction breakpoint on %s in %s", __FUNCTION__, new_bp ? "new" : "existing", kernel_name.GetCString(), - address.GetModule()->GetFileSpec().GetCString()); + address.GetModule()->GetFileSpec().GetPath().c_str()); } } } @@ -2984,7 +2984,8 @@ bool RSModuleDescriptor::ParseRSInfo() { const llvm::StringRef raw_rs_info((const char *)buffer->GetBytes()); raw_rs_info.split(info_lines, '\n'); LLDB_LOGF(log, "'.rs.info symbol for '%s':\n%s", - m_module->GetFileSpec().GetCString(), raw_rs_info.str().c_str()); + m_module->GetFileSpec().GetPath().c_str(), + raw_rs_info.str().c_str()); } enum { @@ -4112,7 +4113,7 @@ public: } llvm::ArrayRef<OptionDefinition> GetDefinitions() override { - return llvm::makeArrayRef(g_renderscript_reduction_bp_set_options); + return llvm::ArrayRef(g_renderscript_reduction_bp_set_options); } bool ParseReductionTypes(llvm::StringRef option_val, @@ -4264,7 +4265,7 @@ public: } llvm::ArrayRef<OptionDefinition> GetDefinitions() override { - return llvm::makeArrayRef(g_renderscript_kernel_bp_set_options); + return llvm::ArrayRef(g_renderscript_kernel_bp_set_options); } RSCoordinate m_coord; @@ -4544,7 +4545,7 @@ public: } llvm::ArrayRef<OptionDefinition> GetDefinitions() override { - return llvm::makeArrayRef(g_renderscript_runtime_alloc_dump_options); + return llvm::ArrayRef(g_renderscript_runtime_alloc_dump_options); } FileSpec m_outfile; @@ -4662,7 +4663,7 @@ public: void OptionParsingStarting(ExecutionContext *exe_ctx) override { m_id = 0; } llvm::ArrayRef<OptionDefinition> GetDefinitions() override { - return llvm::makeArrayRef(g_renderscript_runtime_alloc_list_options); + return llvm::ArrayRef(g_renderscript_runtime_alloc_list_options); } uint32_t m_id = 0; diff --git a/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptx86ABIFixups.cpp b/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptx86ABIFixups.cpp index ec8f8d83c4b3..917242e9b287 100644 --- a/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptx86ABIFixups.cpp +++ b/contrib/llvm-project/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptx86ABIFixups.cpp @@ -122,7 +122,7 @@ findRSCallSites(llvm::Module &module, std::set<llvm::CallInst *> &rs_callsites, bool found = false; for (auto &func : module.getFunctionList()) - for (auto &block : func.getBasicBlockList()) + for (auto &block : func) for (auto &inst : block) { llvm::CallInst *call_inst = llvm::dyn_cast_or_null<llvm::CallInst>(&inst); |