From bb103d928ec241d884ed38747e12ac17f05600c4 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Mon, 31 Oct 2016 16:48:30 +0000 Subject: [PATCH] Use toCharUnitsFromBits instead of TargetInfo::getCharWidth llvm-svn: 285595 --- clang/lib/CodeGen/CGBuiltin.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp index 54566aa7e519..4728aadf7333 100644 --- a/clang/lib/CodeGen/CGBuiltin.cpp +++ b/clang/lib/CodeGen/CGBuiltin.cpp @@ -1142,7 +1142,9 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD, const TargetInfo &TI = getContext().getTargetInfo(); // The alignment of the alloca should correspond to __BIGGEST_ALIGNMENT__. unsigned SuitableAlignmentInBytes = - TI.getSuitableAlign() / TI.getCharWidth(); + CGM.getContext() + .toCharUnitsFromBits(TI.getSuitableAlign()) + .getQuantity(); AllocaInst *AI = Builder.CreateAlloca(Builder.getInt8Ty(), Size); AI->setAlignment(SuitableAlignmentInBytes); return RValue::get(AI); @@ -1150,11 +1152,11 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD, case Builtin::BI__builtin_alloca_with_align: { Value *Size = EmitScalarExpr(E->getArg(0)); - Value *AlignmentValue = EmitScalarExpr(E->getArg(1)); - auto *AlignmentCI = cast(AlignmentValue); - unsigned Alignment = AlignmentCI->getZExtValue(); - const TargetInfo &TI = getContext().getTargetInfo(); - unsigned AlignmentInBytes = Alignment / TI.getCharWidth(); + Value *AlignmentInBitsValue = EmitScalarExpr(E->getArg(1)); + auto *AlignmentInBitsCI = cast(AlignmentInBitsValue); + unsigned AlignmentInBits = AlignmentInBitsCI->getZExtValue(); + unsigned AlignmentInBytes = + CGM.getContext().toCharUnitsFromBits(AlignmentInBits).getQuantity(); AllocaInst *AI = Builder.CreateAlloca(Builder.getInt8Ty(), Size); AI->setAlignment(AlignmentInBytes); return RValue::get(AI); -- 2.34.1