Use TypedPointerType in lieu of PointerIndirectPair in mangleBuiltin. (#1568)

Author: jcranmer-intel

include/LLVMSPIRVLib.h

@@ -106,10 +106,6 @@ std::unique_ptr<SPIRVModule> readSpirvModule(std::istream &IS,
                                              const SPIRV::TranslatorOpts &Opts,
                                              std::string &ErrMsg);
 
-/// This contains a pair of the pointer element type and an indirection
-/// parameter (to capture cases where an array of OpenCL types is used).
-typedef llvm::PointerIntPair<llvm::Type *, 1, bool> PointerIndirectPair;
-
 } // End namespace SPIRV
 
 namespace llvm {
@@ -160,13 +156,11 @@ bool regularizeLlvmForSpirv(Module *M, std::string &ErrMsg,
                             const SPIRV::TranslatorOpts &Opts);
 
 /// \brief Mangle OpenCL builtin function function name.
-/// If any type in ArgTypes is a pointer type, the corresponding entry in
-/// ArgPointerTypes should contain the type should point to. If there are no
-/// pointer-typed arguments in ArgTypes, then ArgPointerTypes may be empty.
+/// If any type in ArgTypes is a pointer type, it should be represented as a
+/// TypedPointerType instead, to faithfully represent the pointer element types
+/// for name mangling.
 void mangleOpenClBuiltin(const std::string &UnmangledName,
-                         ArrayRef<Type *> ArgTypes,
-                         ArrayRef<SPIRV::PointerIndirectPair> ArgPointerTypes,
-                         std::string &MangledName);
+                         ArrayRef<Type *> ArgTypes, std::string &MangledName);
 
 /// Create a pass for translating LLVM to SPIR-V.
 ModulePass *createLLVMToSPIRVLegacy(SPIRV::SPIRVModule *);

lib/SPIRV/OCLUtil.cpp

@@ -1604,9 +1604,7 @@ Value *SPIRV::transSPIRVMemorySemanticsIntoOCLMemFenceFlags(
 
 void llvm::mangleOpenClBuiltin(const std::string &UniqName,
                                ArrayRef<Type *> ArgTypes,
-                               ArrayRef<PointerIndirectPair> PointerElementTys,
                                std::string &MangledName) {
   OCLUtil::OCLBuiltinFuncMangleInfo BtnInfo(ArgTypes);
-  BtnInfo.fillPointerElementTypes(PointerElementTys);
   MangledName = SPIRV::mangleBuiltin(UniqName, ArgTypes, &BtnInfo);
 }

lib/SPIRV/SPIRVInternal.h

@@ -457,11 +457,11 @@ struct BuiltinArgTypeMangleInfo {
   bool IsLocalArgBlock;
   SPIR::TypePrimitiveEnum Enum;
   unsigned Attr;
-  PointerIndirectPair PointerElementType;
+  Type *PointerTy;
   BuiltinArgTypeMangleInfo()
       : IsSigned(true), IsVoidPtr(false), IsEnum(false), IsSampler(false),
         IsAtomic(false), IsLocalArgBlock(false), Enum(SPIR::PRIMITIVE_NONE),
-        Attr(0), PointerElementType(nullptr, false) {}
+        Attr(0), PointerTy(nullptr) {}
 };
 
 /// Information for mangling builtin function.
@@ -519,8 +519,6 @@ class BuiltinFuncMangleInfo {
     UnmangledName = UniqUnmangledName.str();
   }
 
-  void fillPointerElementTypes(ArrayRef<PointerIndirectPair>);
-
 protected:
   std::string UnmangledName;
   std::vector<BuiltinArgTypeMangleInfo> ArgInfo;
@@ -987,7 +985,6 @@ inline void getParameterTypes(CallInst *CI,
 /// manner
 std::string getSPIRVFriendlyIRFunctionName(OCLExtOpKind ExtOpId,
                                            ArrayRef<Type *> ArgTys,
-                                           ArrayRef<PointerIndirectPair> PETs,
                                            Type *RetTy = nullptr);
 
 /// Mangle a function in SPIR-V friendly IR manner
@@ -999,8 +996,7 @@ std::string getSPIRVFriendlyIRFunctionName(OCLExtOpKind ExtOpId,
 /// \param Types of arguments of SPIR-V built-in function
 /// \return IA64 mangled name.
 std::string getSPIRVFriendlyIRFunctionName(const std::string &UniqName,
-                                           spv::Op OC, ArrayRef<Type *> ArgTys,
-                                           ArrayRef<PointerIndirectPair> PETs);
+                                           spv::Op OC, ArrayRef<Type *> ArgTys);
 
 /// Cast a function to a void(void) funtion pointer.
 Constant *castToVoidFuncPtr(Function *F);