Commit 2c68eccc authored by Nikita Popov's avatar Nikita Popov
Browse files

[OpaquePtr] Remove uses of CreateGEP() without element type 

Remove uses of to-be-deprecated API. In cases where the correct
element type was not immediately obvious to me, fall back to
explicit getPointerElementType().
parent f95d2600

clang/lib/CodeGen/CGBuilder.h

+2 −1
Original line number Diff line number Diff line
@@ -261,7 +261,8 @@ public: 
  Address CreateConstByteGEP(Address Addr, CharUnits Offset,

                             const llvm::Twine &Name = "") {

    assert(Addr.getElementType() == TypeCache.Int8Ty);

    return Address(CreateGEP(Addr.getPointer(), getSize(Offset), Name),

    return Address(CreateGEP(Addr.getElementType(), Addr.getPointer(),

                             getSize(Offset), Name),

                   Addr.getAlignment().alignmentAtOffset(Offset));

  }

clang/lib/CodeGen/CGBuiltin.cpp

+14 −11
Original line number Diff line number Diff line
@@ -9358,7 +9358,8 @@ Value *CodeGenFunction::EmitAArch64BuiltinExpr(unsigned BuiltinID, 
      llvm::Value *Val = Builder.CreateCall(F, MemAddr);

      llvm::Value *ToRet;

      for (size_t i = 0; i < 8; i++) {

        llvm::Value *ValOffsetPtr = Builder.CreateGEP(ValPtr, Builder.getInt32(i));

        llvm::Value *ValOffsetPtr =

            Builder.CreateGEP(Int64Ty, ValPtr, Builder.getInt32(i));

        Address Addr(ValOffsetPtr, CharUnits::fromQuantity(8));

        ToRet = Builder.CreateStore(Builder.CreateExtractValue(Val, i), Addr);

      }
@@ -9369,7 +9370,8 @@ Value *CodeGenFunction::EmitAArch64BuiltinExpr(unsigned BuiltinID, 
      SmallVector<llvm::Value *, 9> Args;

      Args.push_back(MemAddr);

      for (size_t i = 0; i < 8; i++) {

        llvm::Value *ValOffsetPtr = Builder.CreateGEP(ValPtr, Builder.getInt32(i));

        llvm::Value *ValOffsetPtr =

            Builder.CreateGEP(Int64Ty, ValPtr, Builder.getInt32(i));

        Address Addr(ValOffsetPtr, CharUnits::fromQuantity(8));

        Args.push_back(Builder.CreateLoad(Addr));

      }
@@ -14948,7 +14950,7 @@ Value *CodeGenFunction::EmitPPCBuiltinExpr(unsigned BuiltinID, 
      Ops[0] = Builder.CreateBitCast(Ops[0], Int8PtrTy);

    }else {

      Ops[1] = Builder.CreateBitCast(Ops[1], Int8PtrTy);

      Ops[0] = Builder.CreateGEP(Ops[1], Ops[0]);

      Ops[0] = Builder.CreateGEP(Int8Ty, Ops[1], Ops[0]);

      Ops.pop_back();

    }










@@ -15016,7 +15018,7 @@ Value *CodeGenFunction::EmitPPCBuiltinExpr(unsigned BuiltinID,













      Ops[1] = Builder.CreateBitCast(Ops[1], Int8PtrTy);















    }else {















      Ops[2] = Builder.CreateBitCast(Ops[2], Int8PtrTy);













      Ops[1] = Builder.CreateGEP(Ops[2], Ops[1]);













      Ops[1] = Builder.CreateGEP(Int8Ty, Ops[2], Ops[1]);















      Ops.pop_back();















    }
























@@ -15556,10 +15558,10 @@ Value *CodeGenFunction::EmitPPCBuiltinExpr(unsigned BuiltinID,













      if (BuiltinID == PPC::BI__builtin_vsx_lxvp ||















          BuiltinID == PPC::BI__builtin_mma_lxvp) {















        Ops[1] = Builder.CreateBitCast(Ops[1], Int8PtrTy);













        Ops[0] = Builder.CreateGEP(Ops[1], Ops[0]);













        Ops[0] = Builder.CreateGEP(Int8Ty, Ops[1], Ops[0]);















      } else {















        Ops[2] = Builder.CreateBitCast(Ops[2], Int8PtrTy);













        Ops[1] = Builder.CreateGEP(Ops[2], Ops[1]);













        Ops[1] = Builder.CreateGEP(Int8Ty, Ops[2], Ops[1]);















      }















      Ops.pop_back();















      llvm::Function *F = CGM.getIntrinsic(ID);










@@ -15657,7 +15659,7 @@ Value *EmitAMDGPUWorkGroupSize(CodeGenFunction &CGF, unsigned Index) {













  auto *DP = EmitAMDGPUDispatchPtr(CGF);















  // Indexing the HSA kernel_dispatch_packet struct.















  auto *Offset = llvm::ConstantInt::get(CGF.Int32Ty, XOffset + Index * 2);













  auto *GEP = CGF.Builder.CreateGEP(DP, Offset);













  auto *GEP = CGF.Builder.CreateGEP(CGF.Int8Ty, DP, Offset);















  auto *DstTy =















      CGF.Int16Ty->getPointerTo(GEP->getType()->getPointerAddressSpace());















  auto *Cast = CGF.Builder.CreateBitCast(GEP, DstTy);









@@ -15677,7 +15679,7 @@ Value *EmitAMDGPUGridSize(CodeGenFunction &CGF, unsigned Index) {













  auto *DP = EmitAMDGPUDispatchPtr(CGF);















  // Indexing the HSA kernel_dispatch_packet struct.















  auto *Offset = llvm::ConstantInt::get(CGF.Int32Ty, XOffset + Index * 4);













  auto *GEP = CGF.Builder.CreateGEP(DP, Offset);













  auto *GEP = CGF.Builder.CreateGEP(CGF.Int8Ty, DP, Offset);















  auto *DstTy =















      CGF.Int32Ty->getPointerTo(GEP->getType()->getPointerAddressSpace());















  auto *Cast = CGF.Builder.CreateBitCast(GEP, DstTy);










@@ -17079,7 +17081,7 @@ CodeGenFunction::EmitNVPTXBuiltinExpr(unsigned BuiltinID, const CallExpr *E) {













        Builder.CreateAlignedStore(















            Builder.CreateBitCast(Builder.CreateExtractValue(Result, i),















                                  Dst.getElementType()),













            Builder.CreateGEP(Dst.getPointer(),













            Builder.CreateGEP(Dst.getElementType(), Dst.getPointer(),















                              llvm::ConstantInt::get(IntTy, i)),















            CharUnits::fromQuantity(4));















      }










@@ -17222,7 +17224,8 @@ CodeGenFunction::EmitNVPTXBuiltinExpr(unsigned BuiltinID, const CallExpr *E) {













    for (unsigned i = 0; i < MI.NumEltsD; ++i)















      Builder.CreateAlignedStore(















          Builder.CreateBitCast(Builder.CreateExtractValue(Result, i), DType),













          Builder.CreateGEP(Dst.getPointer(), llvm::ConstantInt::get(IntTy, i)),













          Builder.CreateGEP(Dst.getElementType(), Dst.getPointer(),













                            llvm::ConstantInt::get(IntTy, i)),















          CharUnits::fromQuantity(4));















    return Result;















  }










@@ -17306,7 +17309,7 @@ RValue CodeGenFunction::EmitBuiltinAlignTo(const CallExpr *E, bool AlignUp) {













    // can use an inbounds GEP to enable better optimization.















    Value *Base = EmitCastToVoidPtr(Args.Src);















    if (getLangOpts().isSignedOverflowDefined())













      Result = Builder.CreateGEP(Base, Difference, "aligned_result");













      Result = Builder.CreateGEP(Int8Ty, Base, Difference, "aligned_result");















    else















      Result = EmitCheckedInBoundsGEP(Base, Difference,















                                      /*SignedIndices=*/true,

























clang/lib/CodeGen/CGClass.cpp



+1
−0






























Original line number
Diff line number
Diff line








@@ -1741,6 +1741,7 @@ namespace {













          llvm::ConstantInt::get(CGF.SizeTy, PoisonStart.getQuantity());































      llvm::Value *OffsetPtr = CGF.Builder.CreateGEP(













          CGF.Int8Ty,















          CGF.Builder.CreateBitCast(CGF.LoadCXXThis(), CGF.Int8PtrTy),















          OffsetSizePtr);

















































clang/lib/CodeGen/CGExprScalar.cpp



+13
−8






























Original line number
Diff line number
Diff line








@@ -2588,7 +2588,8 @@ ScalarExprEmitter::EmitScalarPrePostIncDec(const UnaryOperator *E, LValue LV,













      llvm::Value *numElts = CGF.getVLASize(vla).NumElts;















      if (!isInc) numElts = Builder.CreateNSWNeg(numElts, "vla.negsize");















      if (CGF.getLangOpts().isSignedOverflowDefined())













        value = Builder.CreateGEP(value, numElts, "vla.inc");













        value = Builder.CreateGEP(value->getType()->getPointerElementType(),













                                  value, numElts, "vla.inc");















      else















        value = CGF.EmitCheckedInBoundsGEP(















            value, numElts, /*SignedIndices=*/false, isSubtraction,









@@ -2600,7 +2601,7 @@ ScalarExprEmitter::EmitScalarPrePostIncDec(const UnaryOperator *E, LValue LV,





























      value = CGF.EmitCastToVoidPtr(value);















      if (CGF.getLangOpts().isSignedOverflowDefined())













        value = Builder.CreateGEP(value, amt, "incdec.funcptr");













        value = Builder.CreateGEP(CGF.Int8Ty, value, amt, "incdec.funcptr");















      else















        value = CGF.EmitCheckedInBoundsGEP(value, amt, /*SignedIndices=*/false,















                                           isSubtraction, E->getExprLoc(),









@@ -2611,7 +2612,8 @@ ScalarExprEmitter::EmitScalarPrePostIncDec(const UnaryOperator *E, LValue LV,













    } else {















      llvm::Value *amt = Builder.getInt32(amount);















      if (CGF.getLangOpts().isSignedOverflowDefined())













        value = Builder.CreateGEP(value, amt, "incdec.ptr");













        value = Builder.CreateGEP(value->getType()->getPointerElementType(),













                                  value, amt, "incdec.ptr");















      else















        value = CGF.EmitCheckedInBoundsGEP(value, amt, /*SignedIndices=*/false,















                                           isSubtraction, E->getExprLoc(),










@@ -2720,7 +2722,7 @@ ScalarExprEmitter::EmitScalarPrePostIncDec(const UnaryOperator *E, LValue LV,













      llvm::ConstantInt::get(CGF.SizeTy, size.getQuantity());































    if (CGF.getLangOpts().isSignedOverflowDefined())













      value = Builder.CreateGEP(value, sizeValue, "incdec.objptr");













      value = Builder.CreateGEP(CGF.Int8Ty, value, sizeValue, "incdec.objptr");















    else















      value = CGF.EmitCheckedInBoundsGEP(value, sizeValue,















                                         /*SignedIndices=*/false, isSubtraction,










@@ -3445,7 +3447,7 @@ static Value *emitPointerArithmetic(CodeGenFunction &CGF,













    index = CGF.Builder.CreateMul(index, objectSize);































    Value *result = CGF.Builder.CreateBitCast(pointer, CGF.VoidPtrTy);













    result = CGF.Builder.CreateGEP(result, index, "add.ptr");













    result = CGF.Builder.CreateGEP(CGF.Int8Ty, result, index, "add.ptr");















    return CGF.Builder.CreateBitCast(result, pointer->getType());















  }

























@@ -3461,7 +3463,9 @@ static Value *emitPointerArithmetic(CodeGenFunction &CGF,













    // multiply.  We suppress this if overflow is not undefined behavior.















    if (CGF.getLangOpts().isSignedOverflowDefined()) {















      index = CGF.Builder.CreateMul(index, numElements, "vla.index");













      pointer = CGF.Builder.CreateGEP(pointer, index, "add.ptr");













      pointer = CGF.Builder.CreateGEP(













          pointer->getType()->getPointerElementType(), pointer, index,













          "add.ptr");















    } else {















      index = CGF.Builder.CreateNSWMul(index, numElements, "vla.index");















      pointer =









@@ -3476,12 +3480,13 @@ static Value *emitPointerArithmetic(CodeGenFunction &CGF,













  // future proof.















  if (elementType->isVoidType() || elementType->isFunctionType()) {















    Value *result = CGF.EmitCastToVoidPtr(pointer);













    result = CGF.Builder.CreateGEP(result, index, "add.ptr");













    result = CGF.Builder.CreateGEP(CGF.Int8Ty, result, index, "add.ptr");















    return CGF.Builder.CreateBitCast(result, pointer->getType());















  }































  if (CGF.getLangOpts().isSignedOverflowDefined())













    return CGF.Builder.CreateGEP(pointer, index, "add.ptr");













    return CGF.Builder.CreateGEP(













        pointer->getType()->getPointerElementType(), pointer, index, "add.ptr");































  return CGF.EmitCheckedInBoundsGEP(pointer, index, isSigned, isSubtraction,















                                    op.E->getExprLoc(), "add.ptr");

































clang/lib/CodeGen/CGObjC.cpp



+3
−2






























Original line number
Diff line number
Diff line








@@ -1904,8 +1904,9 @@ void CodeGenFunction::EmitObjCForCollectionStmt(const ObjCForCollectionStmt &S){













    Builder.CreateLoad(StateItemsPtr, "stateitems");































  // Fetch the value at the current index from the buffer.













  llvm::Value *CurrentItemPtr =













    Builder.CreateGEP(EnumStateItems, index, "currentitem.ptr");













  llvm::Value *CurrentItemPtr = Builder.CreateGEP(













      EnumStateItems->getType()->getPointerElementType(), EnumStateItems, index,













      "currentitem.ptr");















  llvm::Value *CurrentItem =















    Builder.CreateAlignedLoad(ObjCIdType, CurrentItemPtr, getPointerAlign());