From 5f29bb8a675e8f96452b632e7129113f7dec850e Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Tue, 20 Aug 2019 20:51:52 +0000 Subject: Vendor import of stripped lldb trunk r366426 (just before the release_90 branch point): https://llvm.org/svn/llvm-project/lldb/trunk@366426 --- source/Commands/CommandObjectFrame.cpp | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) (limited to 'source/Commands/CommandObjectFrame.cpp') diff --git a/source/Commands/CommandObjectFrame.cpp b/source/Commands/CommandObjectFrame.cpp index f8318a38e28d..ab6a07952f19 100644 --- a/source/Commands/CommandObjectFrame.cpp +++ b/source/Commands/CommandObjectFrame.cpp @@ -1,14 +1,10 @@ //===-- CommandObjectFrame.cpp ----------------------------------*- C++ -*-===// // -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// - -#include - #include "CommandObjectFrame.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/Module.h" @@ -46,18 +42,17 @@ #include "lldb/Utility/StreamString.h" #include "lldb/Utility/Timer.h" +#include +#include + using namespace lldb; using namespace lldb_private; #pragma mark CommandObjectFrameDiagnose -//------------------------------------------------------------------------- // CommandObjectFrameInfo -//------------------------------------------------------------------------- -//------------------------------------------------------------------------- // CommandObjectFrameDiagnose -//------------------------------------------------------------------------- static constexpr OptionDefinition g_frame_diag_options[] = { // clang-format off @@ -217,9 +212,7 @@ protected: #pragma mark CommandObjectFrameInfo -//------------------------------------------------------------------------- // CommandObjectFrameInfo -//------------------------------------------------------------------------- class CommandObjectFrameInfo : public CommandObjectParsed { public: @@ -243,9 +236,7 @@ protected: #pragma mark CommandObjectFrameSelect -//------------------------------------------------------------------------- // CommandObjectFrameSelect -//------------------------------------------------------------------------- static OptionDefinition g_frame_select_options[] = { // clang-format off @@ -413,9 +404,7 @@ protected: }; #pragma mark CommandObjectFrameVariable -//---------------------------------------------------------------------- // List images with associated information -//---------------------------------------------------------------------- class CommandObjectFrameVariable : public CommandObjectParsed { public: CommandObjectFrameVariable(CommandInterpreter &interpreter) @@ -527,9 +516,9 @@ protected: ConstString(m_option_variable.summary.GetCurrentValue()), summary_format_sp); else if (!m_option_variable.summary_string.IsCurrentValueEmpty()) - summary_format_sp.reset(new StringSummaryFormat( + summary_format_sp = std::make_shared( TypeSummaryImpl::Flags(), - m_option_variable.summary_string.GetCurrentValue())); + m_option_variable.summary_string.GetCurrentValue()); DumpValueObjectOptions options(m_varobj_options.GetAsDumpOptions( eLanguageRuntimeDescriptionDisplayVerbosityFull, eFormatDefault, @@ -901,7 +890,7 @@ bool CommandObjectFrameRecognizerAdd::DoExecute(Args &command, return false; } - ScriptInterpreter *interpreter = m_interpreter.GetScriptInterpreter(); + ScriptInterpreter *interpreter = GetDebugger().GetScriptInterpreter(); if (interpreter && !interpreter->CheckObjectExists(m_options.m_class_name.c_str())) { @@ -1119,9 +1108,7 @@ class CommandObjectFrameRecognizer : public CommandObjectMultiword { #pragma mark CommandObjectMultiwordFrame -//------------------------------------------------------------------------- // CommandObjectMultiwordFrame -//------------------------------------------------------------------------- CommandObjectMultiwordFrame::CommandObjectMultiwordFrame( CommandInterpreter &interpreter) -- cgit v1.2.3