579e70c9b0
We want to do a better job presenting errors that occur when evaluating expressions. Key to this effort is getting away from a model where all errors are spat out onto a stream where the client has to take or leave all of them. To this end, this patch adds a new class, DiagnosticManager, which contains errors produced by the compiler or by LLDB as an expression is created. The DiagnosticManager can dump itself to a log as well as to a string. Clients will (in the future) be able to filter out the errors they're interested in by ID or present subsets of these errors to the user. This patch is not intended to change the *users* of errors - only to thread DiagnosticManagers to all the places where streams are used. I also attempt to standardize our use of errors a bit, removing trailing newlines and making clients omit 'error:', 'warning:' etc. and instead pass the Severity flag. The patch is testsuite-neutral, with modifications to one part of the MI tests because it relied on "error: error:" being erroneously printed. This patch fixes the MI variable handling and the testcase. <rdar://problem/22864976> llvm-svn: 263859
124 lines
4.0 KiB
C++
124 lines
4.0 KiB
C++
//===-- ClangUserExpression.cpp -------------------------------------*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
// C Includes
|
|
#include <stdio.h>
|
|
#if HAVE_SYS_TYPES_H
|
|
# include <sys/types.h>
|
|
#endif
|
|
|
|
// C++ Includes
|
|
|
|
#include "lldb/Core/ConstString.h"
|
|
#include "lldb/Core/Log.h"
|
|
#include "lldb/Core/Module.h"
|
|
#include "lldb/Core/Stream.h"
|
|
#include "lldb/Core/StreamFile.h"
|
|
#include "lldb/Expression/DiagnosticManager.h"
|
|
#include "lldb/Expression/ExpressionSourceCode.h"
|
|
#include "lldb/Expression/FunctionCaller.h"
|
|
#include "lldb/Expression/IRExecutionUnit.h"
|
|
#include "lldb/Expression/UtilityFunction.h"
|
|
#include "lldb/Host/Host.h"
|
|
#include "lldb/Target/ExecutionContext.h"
|
|
#include "lldb/Target/Process.h"
|
|
#include "lldb/Target/Target.h"
|
|
|
|
using namespace lldb_private;
|
|
using namespace lldb;
|
|
|
|
//------------------------------------------------------------------
|
|
/// Constructor
|
|
///
|
|
/// @param[in] text
|
|
/// The text of the function. Must be a full translation unit.
|
|
///
|
|
/// @param[in] name
|
|
/// The name of the function, as used in the text.
|
|
//------------------------------------------------------------------
|
|
UtilityFunction::UtilityFunction (ExecutionContextScope &exe_scope,
|
|
const char *text,
|
|
const char *name) :
|
|
Expression (exe_scope),
|
|
m_execution_unit_sp (),
|
|
m_jit_module_wp (),
|
|
m_function_text (ExpressionSourceCode::g_expression_prefix),
|
|
m_function_name (name)
|
|
{
|
|
if (text && text[0])
|
|
m_function_text.append (text);
|
|
}
|
|
|
|
UtilityFunction::~UtilityFunction ()
|
|
{
|
|
lldb::ProcessSP process_sp (m_jit_process_wp.lock());
|
|
if (process_sp)
|
|
{
|
|
lldb::ModuleSP jit_module_sp (m_jit_module_wp.lock());
|
|
if (jit_module_sp)
|
|
process_sp->GetTarget().GetImages().Remove(jit_module_sp);
|
|
}
|
|
|
|
}
|
|
|
|
// FIXME: We should check that every time this is called it is called with the same return type & arguments...
|
|
|
|
FunctionCaller *
|
|
UtilityFunction::MakeFunctionCaller (const CompilerType &return_type, const ValueList &arg_value_list, Error &error)
|
|
{
|
|
if (m_caller_up)
|
|
return m_caller_up.get();
|
|
|
|
ProcessSP process_sp = m_jit_process_wp.lock();
|
|
if (!process_sp)
|
|
return nullptr;
|
|
|
|
Address impl_code_address;
|
|
impl_code_address.SetOffset(StartAddress());
|
|
std::string name(m_function_name);
|
|
name.append("-caller");
|
|
|
|
m_caller_up.reset (process_sp->GetTarget().GetFunctionCallerForLanguage (Language(),
|
|
return_type,
|
|
impl_code_address,
|
|
arg_value_list,
|
|
name.c_str(),
|
|
error));
|
|
if (error.Fail())
|
|
{
|
|
|
|
return nullptr;
|
|
}
|
|
if (m_caller_up)
|
|
{
|
|
DiagnosticManager diagnostics;
|
|
|
|
unsigned num_errors = m_caller_up->CompileFunction(diagnostics);
|
|
if (num_errors)
|
|
{
|
|
error.SetErrorStringWithFormat("Error compiling %s caller function: \"%s\".", m_function_name.c_str(),
|
|
diagnostics.GetString().c_str());
|
|
m_caller_up.reset();
|
|
return nullptr;
|
|
}
|
|
|
|
diagnostics.Clear();
|
|
ExecutionContext exe_ctx(process_sp);
|
|
|
|
if (!m_caller_up->WriteFunctionWrapper(exe_ctx, diagnostics))
|
|
{
|
|
error.SetErrorStringWithFormat("Error inserting caller function for %s: \"%s\".", m_function_name.c_str(),
|
|
diagnostics.GetString().c_str());
|
|
m_caller_up.reset();
|
|
return nullptr;
|
|
}
|
|
}
|
|
return m_caller_up.get();
|
|
}
|