[lldb] Fix calls to Type::getInt8PtrTy

[pmatos]

These have been removed in 7b9d73c. This is a followup patch to apply the changes to lldb.

[llvmbot]

@llvm/pr-subscribers-lldb

Author: Paulo Matos (pmatos)

Changes

These have been removed in 7b9d73c. This is a followup patch to apply the changes to lldb.

---

Full diff: https://github.com/llvm/llvm-project/pull/71561.diff

2 Files Affected:

• (modified) lldb/source/Plugins/ExpressionParser/Clang/IRDynamicChecks.cpp (+1-1)
• (modified) lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp (+3-3)

diff --git a/lldb/source/Plugins/ExpressionParser/Clang/IRDynamicChecks.cpp b/lldb/source/Plugins/ExpressionParser/Clang/IRDynamicChecks.cpp
index cd7d1ff6148b3b7..bc0f5993aad0d6a 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 81bb0e73e91f9f9..33e5dd0015aebf8 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<Type *> srN_arg_types(type_array, 1);
 

[dtcxzyw]

LGTM.
BTW, I found other uses of Type::getInt8PtrTy in llvm-project/llvm/include/llvm/ProfileData/InstrProfData.inc and llvm-project/compiler-rt/include/profile/InstrProfData.inc.

[pmatos]

LGTM. BTW, I found other uses of Type::getInt8PtrTy in llvm-project/llvm/include/llvm/ProfileData/InstrProfData.inc and llvm-project/compiler-rt/include/profile/InstrProfData.inc.

Thanks, will fix those separately. Lets get lldb to build.