diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-06 20:13:35 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-06 20:13:35 +0000 |
| commit | 6694ed095d6b27a2c92ec4fd63664fcd88a05749 (patch) | |
| tree | 0633c29bd8350e306f3a24a30f3f6045efd35420 /lib/CodeGen/CGExpr.cpp | |
| parent | d5dc75c5cf109efe52b1da32ec44a667389a0f0a (diff) | |
| download | src-6694ed095d6b27a2c92ec4fd63664fcd88a05749.tar.gz src-6694ed095d6b27a2c92ec4fd63664fcd88a05749.zip | |
Vendor import of clang trunk r291274:vendor/clang/clang-trunk-r291274
Notes
Notes:
svn path=/vendor/clang/dist/; revision=311534
svn path=/vendor/clang/clang-trunk-r291274/; revision=311535; tag=vendor/clang/clang-trunk-r291274
Diffstat (limited to 'lib/CodeGen/CGExpr.cpp')
| -rw-r--r-- | lib/CodeGen/CGExpr.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index 183201c78e36..e5e34a5f3ed6 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -604,12 +604,13 @@ void CodeGenFunction::EmitTypeCheck(TypeCheckKind TCK, SourceLocation Loc, } if (Checks.size() > 0) { + // Make sure we're not losing information. Alignment needs to be a power of + // 2 + assert(!AlignVal || (uint64_t)1 << llvm::Log2_64(AlignVal) == AlignVal); llvm::Constant *StaticData[] = { - EmitCheckSourceLocation(Loc), - EmitCheckTypeDescriptor(Ty), - llvm::ConstantInt::get(SizeTy, AlignVal), - llvm::ConstantInt::get(Int8Ty, TCK) - }; + EmitCheckSourceLocation(Loc), EmitCheckTypeDescriptor(Ty), + llvm::ConstantInt::get(Int8Ty, AlignVal ? llvm::Log2_64(AlignVal) : 1), + llvm::ConstantInt::get(Int8Ty, TCK)}; EmitCheck(Checks, SanitizerHandler::TypeMismatch, StaticData, Ptr); } |