From 7971aa9ebf8833337eefb5bfd67f78319b0811be Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Tue, 7 Nov 2023 18:27:54 +0100 Subject: [PATCH] [lldb] Fix calls to Type::getInt8PtrTy These have been removed in 7b9d73c2f90c0ed8497339a16fc39785349d9610. This is a followup patch to apply the changes to lldb. --- .../Plugins/ExpressionParser/Clang/IRDynamicChecks.cpp | 2 +- lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lldb/source/Plugins/ExpressionParser/Clang/IRDynamicChecks.cpp b/lldb/source/Plugins/ExpressionParser/Clang/IRDynamicChecks.cpp index cd7d1ff6148b3b..bc0f5993aad0d6 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/IRDynamicChecks.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/IRDynamicChecks.cpp @@ -273,7 +273,7 @@ class Instrumenter { PointerType *GetI8PtrTy() { if (!m_i8ptr_ty) - m_i8ptr_ty = llvm::Type::getInt8PtrTy(m_module.getContext()); + m_i8ptr_ty = llvm::PointerType::getUnqual(m_module.getContext()); return m_i8ptr_ty; } diff --git a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp index 81bb0e73e91f9f..33e5dd0015aebf 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp @@ -404,7 +404,7 @@ bool IRForTarget::RewriteObjCConstString(llvm::GlobalVariable *ns_str, Type *ns_str_ty = ns_str->getType(); - Type *i8_ptr_ty = Type::getInt8PtrTy(m_module->getContext()); + Type *i8_ptr_ty = PointerType::getUnqual(m_module->getContext()); Type *i32_ty = Type::getInt32Ty(m_module->getContext()); Type *i8_ty = Type::getInt8Ty(m_module->getContext()); @@ -801,11 +801,11 @@ bool IRForTarget::RewriteObjCSelector(Instruction *selector_load) { // is uint8_t* // Type *sel_type = StructType::get(m_module->getContext()); // Type *sel_ptr_type = PointerType::getUnqual(sel_type); - Type *sel_ptr_type = Type::getInt8PtrTy(m_module->getContext()); + Type *sel_ptr_type = PointerType::getUnqual(m_module->getContext()); Type *type_array[1]; - type_array[0] = llvm::Type::getInt8PtrTy(m_module->getContext()); + type_array[0] = llvm::PointerType::getUnqual(m_module->getContext()); ArrayRef srN_arg_types(type_array, 1);