[Opaque Pointer] Revert some reverts and API usage removal (#11175)

- Revert "Revert "[SROA] Break typed pointer support""
- Revert "Revert "[LTO] Remove OpaquePointers option from config (NFC)""
- Revert "Revert "[LLVMContext] Remove hasSetOpaquePointersValue() API
(NFC)""
- Revert "Make opaque pointer mode the default for 'llvm-c-test
--echo'."
- Revert "Fix commit 4f7e5d2 for typed pointers"
- API usage removal

Author: jsji

clang/lib/CodeGen/CGExprScalar.cpp

@@ -1661,9 +1661,7 @@ ScalarExprEmitter::VisitSYCLUniqueStableIdExpr(SYCLUniqueStableIdExpr *E) {
   if (GlobalConstStr->getType()->getPointerAddressSpace() == ExprAS)
     return GlobalConstStr;
 
-  llvm::PointerType *PtrTy = cast<llvm::PointerType>(GlobalConstStr->getType());
-  llvm::PointerType *NewPtrTy =
-      llvm::PointerType::getWithSamePointeeType(PtrTy, ExprAS);
+  llvm::PointerType *NewPtrTy = llvm::PointerType::get(VMContext, ExprAS);
   return Builder.CreateAddrSpaceCast(GlobalConstStr, NewPtrTy,
                                      "usid_addr_cast");
 }
@@ -2111,8 +2109,7 @@ Value *ScalarExprEmitter::VisitCastExpr(CastExpr *CE) {
         SrcTy->getPointerAddressSpace() != DstTy->getPointerAddressSpace())
       Src = Builder.CreateAddrSpaceCast(
           Src,
-          llvm::PointerType::getWithSamePointeeType(
-              cast<llvm::PointerType>(SrcTy), DstTy->getPointerAddressSpace()));
+          llvm::PointerType::get(VMContext, DstTy->getPointerAddressSpace()));
     else if (SrcTy->isPtrOrPtrVectorTy() && DstTy->isPtrOrPtrVectorTy() &&
              SrcTy->getPointerAddressSpace() != DstTy->getPointerAddressSpace())
       llvm_unreachable("wrong cast for pointers in different address spaces"

llvm/include/llvm-c/Core.h

@@ -578,13 +578,6 @@ LLVMBool LLVMContextShouldDiscardValueNames(LLVMContextRef C);
  */
 void LLVMContextSetDiscardValueNames(LLVMContextRef C, LLVMBool Discard);
 
-/**
- * Set whether the given context is in opaque pointer mode.
- *
- * @see LLVMContext::setOpaquePointers()
- */
-void LLVMContextSetOpaquePointers(LLVMContextRef C, LLVMBool OpaquePointers);
-
 /**
  * Destroy a context instance.
  *

llvm/include/llvm/IR/DerivedTypes.h

@@ -643,8 +643,6 @@ inline ElementCount VectorType::getElementCount() const {
 class PointerType : public Type {
   explicit PointerType(LLVMContext &C, unsigned AddrSpace);
 
-  Type *PointeeTy;
-
 public:
   PointerType(const PointerType &) = delete;
   PointerType &operator=(const PointerType &) = delete;
@@ -679,13 +677,6 @@ class PointerType : public Type {
     return get(PT->getContext(), AddressSpace);
   }
 
-  [[deprecated("Pointer element types are deprecated. You can *temporarily* "
-               "use Type::getPointerElementType() instead")]]
-  Type *getElementType() const {
-    assert(!isOpaque() && "Attempting to get element type of opaque pointer");
-    return PointeeTy;
-  }
-
   [[deprecated("Always returns true")]] bool isOpaque() const { return true; }
 
   /// Return true if the specified type is valid as a element type.

llvm/include/llvm/IR/LLVMContext.h

@@ -312,9 +312,6 @@ class LLVMContext {
   /// LLVMContext is used by compilation.
   void setOptPassGate(OptPassGate&);
 
-  /// Whether we've decided on using opaque pointers or typed pointers yet.
-  bool hasSetOpaquePointersValue() const;
-
   /// Set whether opaque pointers are enabled. The method may be called multiple
   /// times, but only with the same value. Note that creating a pointer type or
   /// otherwise querying the opaque pointer mode performs an implicit set to

llvm/include/llvm/LTO/Config.h

@@ -180,10 +180,6 @@ struct Config {
   /// Add FSAFDO discriminators.
   bool AddFSDiscriminator = false;
 
-  /// Use opaque pointer types. Used to call LLVMContext::setOpaquePointers
-  /// unless already set by the `-opaque-pointers` commandline option.
-  bool OpaquePointers = true;
-
   /// If this field is set, LTO will write input file paths and symbol
   /// resolutions here in llvm-lto2 command line flag format. This can be
   /// used for testing and for running the LTO pipeline outside of the linker
@@ -299,7 +295,6 @@ struct LTOLLVMContext : LLVMContext {
     enableDebugTypeODRUniquing();
     setDiagnosticHandler(
         std::make_unique<LTOLLVMDiagnosticHandler>(&DiagHandler), true);
-    setOpaquePointers(C.OpaquePointers);
   }
   DiagnosticHandlerFunction DiagHandler;
 };

llvm/lib/IR/Core.cpp

@@ -125,10 +125,6 @@ void LLVMContextSetDiscardValueNames(LLVMContextRef C, LLVMBool Discard) {
   unwrap(C)->setDiscardValueNames(Discard);
 }
 
-void LLVMContextSetOpaquePointers(LLVMContextRef C, LLVMBool OpaquePointers) {
-  unwrap(C)->setOpaquePointers(OpaquePointers);
-}
-
 void LLVMContextDispose(LLVMContextRef C) {
   delete unwrap(C);
 }

llvm/lib/IR/Function.cpp

@@ -1495,19 +1495,6 @@ static bool matchIntrinsicType(
       PointerType *PT = dyn_cast<PointerType>(Ty);
       if (!PT || PT->getAddressSpace() != D.Pointer_AddressSpace)
         return true;
-      if (!PT->isOpaque()) {
-        /* Manually consume a pointer to empty struct descriptor, which is
-         * used for externref. We don't want to enforce that the struct is
-         * anonymous in this case. (This renders externref intrinsics
-         * non-unique, but this will go away with opaque pointers anyway.) */
-        if (Infos.front().Kind == IITDescriptor::Struct &&
-            Infos.front().Struct_NumElements == 0) {
-          Infos = Infos.slice(1);
-          return false;
-        }
-        return matchIntrinsicType(PT->getNonOpaquePointerElementType(), Infos,
-                                  ArgTys, DeferredChecks, IsDeferredCheck);
-      }
       // Consume IIT descriptors relating to the pointer element type.
       // FIXME: Intrinsic type matching of nested single value types or even
       // aggregates doesn't work properly with opaque pointers but hopefully

llvm/lib/SYCLLowerIR/CompileTimePropertiesPass.cpp

@@ -307,7 +307,7 @@ parseSYCLPropertiesString(Module &M, IntrinsicInst *IntrInst) {
 
   auto AnnotValsIntrOpd = IntrInst->getArgOperand(4);
   const GlobalVariable *AnnotValsGV = nullptr;
-  if (AnnotValsIntrOpd->getType()->isOpaquePointerTy())
+  if (AnnotValsIntrOpd->getType()->isPointerTy())
     AnnotValsGV = dyn_cast<GlobalVariable>(AnnotValsIntrOpd);
   else if (const auto *Cast = dyn_cast<BitCastOperator>(AnnotValsIntrOpd))
     AnnotValsGV = dyn_cast<GlobalVariable>(Cast->getOperand(0));
@@ -525,7 +525,7 @@ void CompileTimePropertiesPass::parseAlignmentAndApply(
   // Get the global variable with the annotation string.
   const GlobalVariable *AnnotStrArgGV = nullptr;
   const Value *IntrAnnotStringArg = IntrInst->getArgOperand(1);
-  if (IntrAnnotStringArg->getType()->isOpaquePointerTy())
+  if (IntrAnnotStringArg->getType()->isPointerTy())
     AnnotStrArgGV = dyn_cast<GlobalVariable>(IntrAnnotStringArg);
   else if (auto *GEP = dyn_cast<GEPOperator>(IntrAnnotStringArg))
     AnnotStrArgGV = dyn_cast<GlobalVariable>(GEP->getOperand(0));
@@ -594,7 +594,7 @@ bool CompileTimePropertiesPass::transformSYCLPropertiesAnnotation(
   // Get the global variable with the annotation string.
   const GlobalVariable *AnnotStrArgGV = nullptr;
   const Value *IntrAnnotStringArg = IntrInst->getArgOperand(1);
-  if (IntrAnnotStringArg->getType()->isOpaquePointerTy())
+  if (IntrAnnotStringArg->getType()->isPointerTy())
     AnnotStrArgGV = dyn_cast<GlobalVariable>(IntrAnnotStringArg);
   else if (auto *GEP = dyn_cast<GEPOperator>(IntrAnnotStringArg))
     AnnotStrArgGV = dyn_cast<GlobalVariable>(GEP->getOperand(0));

llvm/lib/SYCLLowerIR/ESIMD/LowerESIMDVLoadVStore.cpp

@@ -102,17 +102,17 @@ PreservedAnalyses ESIMDLowerLoadStorePass::run(Function &F,
       if (AS0 != AS1) {
         IRBuilder<> Builder(&Inst);
         if (GenXIntrinsic::isVStore(&Inst)) {
-          auto PtrTy = cast<PointerType>(Inst.getOperand(1)->getType());
-          PtrTy = PointerType::getWithSamePointeeType(PtrTy, AS1);
+          auto PtrTy = PointerType::get(
+              Inst.getOperand(1)->getType()->getContext(), AS1);
           auto PtrCast = Builder.CreateAddrSpaceCast(Inst.getOperand(1), PtrTy);
           Type *Tys[] = {Inst.getOperand(0)->getType(), PtrCast->getType()};
           Value *Args[] = {Inst.getOperand(0), PtrCast};
           Function *Fn = GenXIntrinsic::getGenXDeclaration(
               F.getParent(), GenXIntrinsic::genx_vstore, Tys);
           Builder.CreateCall(Fn, Args, Inst.getName());
         } else {
-          auto PtrTy = cast<PointerType>(Inst.getOperand(0)->getType());
-          PtrTy = PointerType::getWithSamePointeeType(PtrTy, AS1);
+          auto PtrTy = PointerType::get(
+              Inst.getOperand(0)->getType()->getContext(), AS1);
           auto PtrCast = Builder.CreateAddrSpaceCast(Inst.getOperand(0), PtrTy);
           Type *Tys[] = {Inst.getType(), PtrCast->getType()};
           Function *Fn = GenXIntrinsic::getGenXDeclaration(