diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2019-06-14 17:46:38 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2019-06-14 17:46:38 +0000 |
| commit | 27252a1f9546ba379b76176d6f6707a1ae8d05cd (patch) | |
| tree | 154bfc319ec7f544da295c4863cb9cb16807c7e1 /clang/lib/CodeGen/CGExprAgg.cpp | |
| parent | 24cdcadcc5e875b05bbb70eb123ea4f0a018ee83 (diff) | |
| download | bcm5719-llvm-27252a1f9546ba379b76176d6f6707a1ae8d05cd.tar.gz bcm5719-llvm-27252a1f9546ba379b76176d6f6707a1ae8d05cd.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.
This reinstates r363337, reverted in r363352.
llvm-svn: 363429
Diffstat (limited to 'clang/lib/CodeGen/CGExprAgg.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGExprAgg.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp index a76058c1472..3b1c5bf876e 100644 --- a/clang/lib/CodeGen/CGExprAgg.cpp +++ b/clang/lib/CodeGen/CGExprAgg.cpp @@ -1352,7 +1352,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; |
