diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2018-11-03 02:23:33 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2018-11-03 02:23:33 +0000 |
commit | 35018958637384423c1f8a48628c8f3f8dea23c5 (patch) | |
tree | d7bb426a5653b3e26093680054b15c90442da7b8 /clang/lib/Sema/SemaInit.cpp | |
parent | c39b97f2112e015cd463ddc434945ba04dba687d (diff) | |
download | bcm5719-llvm-35018958637384423c1f8a48628c8f3f8dea23c5.tar.gz bcm5719-llvm-35018958637384423c1f8a48628c8f3f8dea23c5.zip |
Revert r345562: "PR23833, DR2140: an lvalue-to-rvalue conversion on a glvalue of type"
This exposes a (known) CodeGen bug: it can't cope with emitting lvalue
expressions that denote non-odr-used but usable-in-constant-expression
variables. See PR39528 for a testcase.
Reverted for now until that issue can be fixed.
llvm-svn: 346065
Diffstat (limited to 'clang/lib/Sema/SemaInit.cpp')
-rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 0cfac997199..1e4d12d20cd 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -7644,13 +7644,9 @@ InitializationSequence::Perform(Sema &S, case SK_LValueToRValue: { assert(CurInit.get()->isGLValue() && "cannot load from a prvalue"); - // C++ [conv.lval]p3: - // If T is cv std::nullptr_t, the result is a null pointer constant. - CastKind CK = - Step->Type->isNullPtrType() ? CK_NullToPointer : CK_LValueToRValue; - CurInit = - ImplicitCastExpr::Create(S.Context, Step->Type, CK, CurInit.get(), - /*BasePath=*/nullptr, VK_RValue); + CurInit = ImplicitCastExpr::Create(S.Context, Step->Type, + CK_LValueToRValue, CurInit.get(), + /*BasePath=*/nullptr, VK_RValue); break; } |