summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/CGExprAgg.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2018-10-30 02:02:49 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2018-10-30 02:02:49 +0000
commitd2e69dfddbed3dccc7926cdf01e6aa32f47a0570 (patch)
tree19f42d86224a092777aab4fb1f18186668d7f54f /clang/lib/CodeGen/CGExprAgg.cpp
parent2f3e8b3d2e4c8679d891568ddc7b6fc73d19c4aa (diff)
downloadbcm5719-llvm-d2e69dfddbed3dccc7926cdf01e6aa32f47a0570.tar.gz
bcm5719-llvm-d2e69dfddbed3dccc7926cdf01e6aa32f47a0570.zip
PR23833, DR2140: an lvalue-to-rvalue conversion on a glvalue of type
nullptr_t does not access memory. We now reuse CK_NullToPointer to represent a conversion from a glvalue of type nullptr_t to a prvalue of nullptr_t where necessary. llvm-svn: 345562
Diffstat (limited to 'clang/lib/CodeGen/CGExprAgg.cpp')
-rw-r--r--clang/lib/CodeGen/CGExprAgg.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp
index 42481939fa1..0bbf3a6c561 100644
--- a/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/clang/lib/CodeGen/CGExprAgg.cpp
@@ -1300,7 +1300,8 @@ static bool isSimpleZero(const Expr *E, CodeGenFunction &CGF) {
// (int*)0 - Null pointer expressions.
if (const CastExpr *ICE = dyn_cast<CastExpr>(E))
return ICE->getCastKind() == CK_NullToPointer &&
- CGF.getTypes().isPointerZeroInitializable(E->getType());
+ CGF.getTypes().isPointerZeroInitializable(E->getType()) &&
+ !E->HasSideEffects(CGF.getContext());
// '\0'
if (const CharacterLiteral *CL = dyn_cast<CharacterLiteral>(E))
return CL->getValue() == 0;
OpenPOWER on IntegriCloud