summaryrefslogtreecommitdiff
path: root/source/Target/ABI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/Target/ABI.cpp')
-rw-r--r--source/Target/ABI.cpp35
1 files changed, 17 insertions, 18 deletions
diff --git a/source/Target/ABI.cpp b/source/Target/ABI.cpp
index 96e09b75094af..28cd9aec665cb 100644
--- a/source/Target/ABI.cpp
+++ b/source/Target/ABI.cpp
@@ -1,17 +1,16 @@
//===-- ABI.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 "lldb/Target/ABI.h"
-#include "Plugins/ExpressionParser/Clang/ClangPersistentVariables.h"
#include "lldb/Core/PluginManager.h"
#include "lldb/Core/Value.h"
#include "lldb/Core/ValueObjectConstResult.h"
+#include "lldb/Expression/ExpressionVariable.h"
#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/TypeSystem.h"
#include "lldb/Target/Target.h"
@@ -40,7 +39,7 @@ ABI::FindPlugin(lldb::ProcessSP process_sp, const ArchSpec &arch) {
ABI::~ABI() = default;
-bool ABI::GetRegisterInfoByName(const ConstString &name, RegisterInfo &info) {
+bool ABI::GetRegisterInfoByName(ConstString name, RegisterInfo &info) {
uint32_t count = 0;
const RegisterInfo *register_info_array = GetRegisterInfoArray(count);
if (register_info_array) {
@@ -125,11 +124,11 @@ ValueObjectSP ABI::GetReturnValueObject(Thread &thread, CompilerType &ast_type,
return_valobj_sp = const_valobj_sp;
- ExpressionVariableSP clang_expr_variable_sp(
+ ExpressionVariableSP expr_variable_sp(
persistent_expression_state->CreatePersistentVariable(
return_valobj_sp));
- assert(clang_expr_variable_sp);
+ assert(expr_variable_sp);
// Set flags and live data as appropriate
@@ -142,21 +141,21 @@ ValueObjectSP ABI::GetReturnValueObject(Thread &thread, CompilerType &ast_type,
break;
case Value::eValueTypeScalar:
case Value::eValueTypeVector:
- clang_expr_variable_sp->m_flags |=
- ClangExpressionVariable::EVIsFreezeDried;
- clang_expr_variable_sp->m_flags |=
- ClangExpressionVariable::EVIsLLDBAllocated;
- clang_expr_variable_sp->m_flags |=
- ClangExpressionVariable::EVNeedsAllocation;
+ expr_variable_sp->m_flags |=
+ ExpressionVariable::EVIsFreezeDried;
+ expr_variable_sp->m_flags |=
+ ExpressionVariable::EVIsLLDBAllocated;
+ expr_variable_sp->m_flags |=
+ ExpressionVariable::EVNeedsAllocation;
break;
case Value::eValueTypeLoadAddress:
- clang_expr_variable_sp->m_live_sp = live_valobj_sp;
- clang_expr_variable_sp->m_flags |=
- ClangExpressionVariable::EVIsProgramReference;
+ expr_variable_sp->m_live_sp = live_valobj_sp;
+ expr_variable_sp->m_flags |=
+ ExpressionVariable::EVIsProgramReference;
break;
}
- return_valobj_sp = clang_expr_variable_sp->GetValueObject();
+ return_valobj_sp = expr_variable_sp->GetValueObject();
}
return return_valobj_sp;
}