diff options
author | Nikita Popov <npopov@redhat.com> | 2022-02-14 09:31:27 +0100 |
---|---|---|
committer | Nikita Popov <npopov@redhat.com> | 2022-02-14 09:34:24 +0100 |
commit | 2df9430fbfaf40ecce5f902651e2725aaa4c275b (patch) | |
tree | 0c737a8062ef28884f48cbb3d2812d89651ebaeb | |
parent | 1be1fd735d5abd669453c0ebc5d5fa780ceeb9c9 (diff) |
[lldb] Remove uses of PointerType::getElementType()
This method has been deprecated and removed. I missed these usages
in lldb previously.
-rw-r--r-- | lldb/source/Expression/IRInterpreter.cpp | 18 | ||||
-rw-r--r-- | lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp | 2 |
2 files changed, 3 insertions, 17 deletions
diff --git a/lldb/source/Expression/IRInterpreter.cpp b/lldb/source/Expression/IRInterpreter.cpp index 2ad51d0e8402..338d387d39fc 100644 --- a/lldb/source/Expression/IRInterpreter.cpp +++ b/lldb/source/Expression/IRInterpreter.cpp @@ -1193,16 +1193,6 @@ bool IRInterpreter::Interpret(llvm::Module &module, llvm::Function &function, const Value *pointer_operand = load_inst->getPointerOperand(); - Type *pointer_ty = pointer_operand->getType(); - PointerType *pointer_ptr_ty = dyn_cast<PointerType>(pointer_ty); - if (!pointer_ptr_ty) { - LLDB_LOGF(log, "getPointerOperand()->getType() is not a PointerType"); - error.SetErrorToGenericError(); - error.SetErrorString(interpreter_internal_error); - return false; - } - Type *target_ty = pointer_ptr_ty->getElementType(); - lldb::addr_t D = frame.ResolveValue(load_inst, module); lldb::addr_t P = frame.ResolveValue(pointer_operand, module); @@ -1231,6 +1221,7 @@ bool IRInterpreter::Interpret(llvm::Module &module, llvm::Function &function, return false; } + Type *target_ty = load_inst->getType(); size_t target_size = data_layout.getTypeStoreSize(target_ty); lldb_private::DataBufferHeap buffer(target_size, 0); @@ -1276,12 +1267,6 @@ bool IRInterpreter::Interpret(llvm::Module &module, llvm::Function &function, const Value *value_operand = store_inst->getValueOperand(); const Value *pointer_operand = store_inst->getPointerOperand(); - Type *pointer_ty = pointer_operand->getType(); - PointerType *pointer_ptr_ty = dyn_cast<PointerType>(pointer_ty); - if (!pointer_ptr_ty) - return false; - Type *target_ty = pointer_ptr_ty->getElementType(); - lldb::addr_t D = frame.ResolveValue(value_operand, module); lldb::addr_t P = frame.ResolveValue(pointer_operand, module); @@ -1310,6 +1295,7 @@ bool IRInterpreter::Interpret(llvm::Module &module, llvm::Function &function, return false; } + Type *target_ty = value_operand->getType(); size_t target_size = data_layout.getTypeStoreSize(target_ty); lldb_private::DataBufferHeap buffer(target_size, 0); diff --git a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp index 428fe3363056..fee1a2a5e5e6 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp @@ -328,7 +328,7 @@ bool IRForTarget::CreateResultVariable(llvm::Function &llvm_function) { // Construct a new result global and set up its metadata GlobalVariable *new_result_global = new GlobalVariable( - (*m_module), result_global->getType()->getElementType(), + (*m_module), result_global->getValueType(), false, /* not constant */ GlobalValue::ExternalLinkage, nullptr, /* no initializer */ m_result_name.GetCString()); |