diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-12-28 21:23:03 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-12-28 21:23:03 +0000 |
| commit | 55e6d896ad333f07bb3b1ba487df214fc268a4ab (patch) | |
| tree | 9ac2087dfbe8507c56dd39d17cad42836448829f /lib/CodeGen/CGExpr.cpp | |
| parent | 1de93ee5610e8a97e753c881c574f8d994e71373 (diff) | |
| download | src-55e6d896ad333f07bb3b1ba487df214fc268a4ab.tar.gz src-55e6d896ad333f07bb3b1ba487df214fc268a4ab.zip | |
Vendor import of clang trunk r321530:vendor/clang/clang-trunk-r321545vendor/clang/clang-trunk-r321530
Notes
Notes:
svn path=/vendor/clang/dist/; revision=327302
svn path=/vendor/clang/clang-trunk-r321545/; revision=327322; tag=vendor/clang/clang-trunk-r321545
Diffstat (limited to 'lib/CodeGen/CGExpr.cpp')
| -rw-r--r-- | lib/CodeGen/CGExpr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index 90eeddf5cc0b..c7dc8337e19e 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -570,7 +570,7 @@ static llvm::Value *emitHash16Bytes(CGBuilderTy &Builder, llvm::Value *Low, bool CodeGenFunction::isNullPointerAllowed(TypeCheckKind TCK) { return TCK == TCK_DowncastPointer || TCK == TCK_Upcast || - TCK == TCK_UpcastToVirtualBase; + TCK == TCK_UpcastToVirtualBase || TCK == TCK_DynamicOperation; } bool CodeGenFunction::isVptrCheckRequired(TypeCheckKind TCK, QualType Ty) { @@ -578,7 +578,7 @@ bool CodeGenFunction::isVptrCheckRequired(TypeCheckKind TCK, QualType Ty) { return (RD && RD->hasDefinition() && RD->isDynamicClass()) && (TCK == TCK_MemberAccess || TCK == TCK_MemberCall || TCK == TCK_DowncastPointer || TCK == TCK_DowncastReference || - TCK == TCK_UpcastToVirtualBase); + TCK == TCK_UpcastToVirtualBase || TCK == TCK_DynamicOperation); } bool CodeGenFunction::sanitizePerformTypeCheck() const { |