diff options
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 15 | ||||
| -rw-r--r-- | clang/test/SemaCXX/uninitialized.cpp | 16 |
2 files changed, 26 insertions, 5 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 9203df3fe5b..a3227aa2960 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -8404,8 +8404,7 @@ namespace { } void VisitImplicitCastExpr(ImplicitCastExpr *E) { - if (E->getCastKind() == CK_LValueToRValue || - (isRecordType && E->getCastKind() == CK_NoOp)) { + if (E->getCastKind() == CK_LValueToRValue) { HandleValue(E->getSubExpr()); return; } @@ -8473,9 +8472,15 @@ namespace { void VisitCXXConstructExpr(CXXConstructExpr *E) { if (E->getConstructor()->isCopyConstructor()) { - if (DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(E->getArg(0))) { - HandleDeclRefExpr(DRE); - } + Expr *ArgExpr = E->getArg(0); + if (InitListExpr *ILE = dyn_cast<InitListExpr>(ArgExpr)) + if (ILE->getNumInits() == 1) + ArgExpr = ILE->getInit(0); + if (ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(ArgExpr)) + if (ICE->getCastKind() == CK_NoOp) + ArgExpr = ICE->getSubExpr(); + HandleValue(ArgExpr); + return; } Inherited::VisitCXXConstructExpr(E); } diff --git a/clang/test/SemaCXX/uninitialized.cpp b/clang/test/SemaCXX/uninitialized.cpp index a7997e4268c..f1825ba5d1f 100644 --- a/clang/test/SemaCXX/uninitialized.cpp +++ b/clang/test/SemaCXX/uninitialized.cpp @@ -150,6 +150,7 @@ A getA(int x) { return A(); } A getA(A* a) { return A(); } A getA(A a) { return A(); } A moveA(A&& a) { return A(); } +A const_refA(const A& a) { return A(); } void setupA(bool x) { A a1; @@ -195,6 +196,13 @@ void setupA(bool x) { A a33 = A(std::move(a33)); // expected-warning {{variable 'a33' is uninitialized when used within its own initialization}} A a34(std::move(a34)); // expected-warning {{variable 'a34' is uninitialized when used within its own initialization}} A a35 = std::move(x ? a34 : (37, a35)); // expected-warning {{variable 'a35' is uninitialized when used within its own initialization}} + + A a36 = const_refA(a36); + A a37(const_refA(a37)); + + A a38({a38}); // expected-warning {{variable 'a38' is uninitialized when used within its own initialization}} + A a39 = {a39}; // expected-warning {{variable 'a39' is uninitialized when used within its own initialization}} + A a40 = A({a40}); // expected-warning {{variable 'a40' is uninitialized when used within its own initialization}} } bool cond; @@ -239,6 +247,14 @@ A a32 = moveA(std::move(a32)); // expected-warning {{variable 'a32' is uninitia A a33 = A(std::move(a33)); // expected-warning {{variable 'a33' is uninitialized when used within its own initialization}} A a34(std::move(a34)); // expected-warning {{variable 'a34' is uninitialized when used within its own initialization}} A a35 = std::move(x ? a34 : (37, a35)); // expected-warning {{variable 'a35' is uninitialized when used within its own initialization}} + +A a36 = const_refA(a36); +A a37(const_refA(a37)); + +A a38({a38}); // expected-warning {{variable 'a38' is uninitialized when used within its own initialization}} +A a39 = {a39}; // expected-warning {{variable 'a39' is uninitialized when used within its own initialization}} +A a40 = A({a40}); // expected-warning {{variable 'a40' is uninitialized when used within its own initialization}} + struct B { // POD struct. int x; |
