@@ -81,9 +81,9 @@ INSTR_PROF_DATA(const IntPtrT, IntPtrTy, BitmapPtr, RelativeBitmapPtr)
8181 * function name hashes during the conversion from raw to merged profile
8282 * data.
8383 */
84- INSTR_PROF_DATA(const IntPtrT, llvm::Type::getInt8PtrTy (Ctx), FunctionPointer, \
84+ INSTR_PROF_DATA(const IntPtrT, llvm::PointerType::getUnqual (Ctx), FunctionPointer, \
8585 FunctionAddr)
86- INSTR_PROF_DATA(IntPtrT, llvm::Type::getInt8PtrTy (Ctx), Values, \
86+ INSTR_PROF_DATA(IntPtrT, llvm::PointerType::getUnqual (Ctx), Values, \
8787 ValuesPtrExpr)
8888INSTR_PROF_DATA(const uint32_t , llvm::Type::getInt32Ty(Ctx), NumCounters, \
8989 ConstantInt::get(llvm::Type::getInt32Ty(Ctx), NumCounters))
@@ -116,7 +116,7 @@ INSTR_PROF_VALUE_NODE(uint64_t, llvm::Type::getInt64Ty(Ctx), Value, \
116116 ConstantInt::get(llvm::Type::GetInt64Ty(Ctx), 0))
117117INSTR_PROF_VALUE_NODE(uint64_t , llvm::Type::getInt64Ty(Ctx), Count, \
118118 ConstantInt::get(llvm::Type::GetInt64Ty(Ctx), 0))
119- INSTR_PROF_VALUE_NODE(PtrToNodeT, llvm::Type::getInt8PtrTy (Ctx), Next, \
119+ INSTR_PROF_VALUE_NODE(PtrToNodeT, llvm::PointerType::getUnqual (Ctx), Next, \
120120 ConstantInt::get(llvm::Type::GetInt8PtrTy(Ctx), 0))
121121#undef INSTR_PROF_VALUE_NODE
122122/* INSTR_PROF_VALUE_NODE end. */
@@ -160,7 +160,7 @@ INSTR_PROF_RAW_HEADER(uint64_t, ValueKindLast, IPVK_Last)
160160#endif
161161VALUE_PROF_FUNC_PARAM (uint64_t , TargetValue, Type::getInt64Ty(Ctx)) \
162162 INSTR_PROF_COMMA
163- VALUE_PROF_FUNC_PARAM(void *, Data, Type::getInt8PtrTy (Ctx)) INSTR_PROF_COMMA
163+ VALUE_PROF_FUNC_PARAM(void *, Data, PointerType::getUnqual (Ctx)) INSTR_PROF_COMMA
164164VALUE_PROF_FUNC_PARAM(uint32_t , CounterIndex, Type::getInt32Ty(Ctx))
165165#undef VALUE_PROF_FUNC_PARAM
166166#undef INSTR_PROF_COMMA
@@ -213,9 +213,9 @@ VALUE_PROF_KIND(IPVK_Last, IPVK_MemOPSize, "last")
213213#define INSTR_PROF_DATA_DEFINED
214214#endif
215215#ifdef COVMAP_V1
216- COVMAP_FUNC_RECORD (const IntPtrT, llvm::Type::getInt8PtrTy (Ctx), \
216+ COVMAP_FUNC_RECORD (const IntPtrT, llvm::PointerType::getUnqual (Ctx), \
217217 NamePtr, llvm::ConstantExpr::getBitCast(NamePtr, \
218- llvm::Type::getInt8PtrTy (Ctx)))
218+ llvm::PointerType::getUnqual (Ctx)))
219219COVMAP_FUNC_RECORD(const uint32_t , llvm::Type::getInt32Ty(Ctx), NameSize, \
220220 llvm::ConstantInt::get(llvm::Type::getInt32Ty(Ctx), \
221221 NameValue.size()))
@@ -350,7 +350,7 @@ typedef struct ValueProfRecord {
350350 * Do byte swap for this instance. \c Old is the original order before
351351 * the swap, and \c New is the New byte order.
352352 */
353- void swapBytes (support ::endianness Old, support ::endianness New);
353+ void swapBytes (llvm ::endianness Old, llvm ::endianness New);
354354#endif
355355} ValueProfRecord;
356356
@@ -405,15 +405,15 @@ typedef struct ValueProfData {
405405 static Expected<std::unique_ptr<ValueProfData>>
406406 getValueProfData (const unsigned char *SrcBuffer,
407407 const unsigned char *const SrcBufferEnd,
408- support ::endianness SrcDataEndianness);
408+ llvm ::endianness SrcDataEndianness);
409409 /* !
410410 * Swap byte order from \c Endianness order to host byte order.
411411 */
412- void swapBytesToHost (support ::endianness Endianness);
412+ void swapBytesToHost (llvm ::endianness Endianness);
413413 /* !
414414 * Swap byte order from host byte order to \c Endianness order.
415415 */
416- void swapBytesFromHost (support ::endianness Endianness);
416+ void swapBytesFromHost (llvm ::endianness Endianness);
417417 /* !
418418 * Return the total size of \c ValueProfileData.
419419 */
0 commit comments