summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/CGExprConstant.cpp
diff options
context:
space:
mode:
authorSebastian Redl <sebastian.redl@getdesigned.at>2011-08-30 19:58:05 +0000
committerSebastian Redl <sebastian.redl@getdesigned.at>2011-08-30 19:58:05 +0000
commit22653bac1a4ba657717fcb17222cc14d4a3720c8 (patch)
tree7f42053d7c0361a007138ef31ad82b68a57ab065 /clang/lib/CodeGen/CGExprConstant.cpp
parent9f2edc8d2c8daf5a0adc2ef25591e329866797f6 (diff)
downloadbcm5719-llvm-22653bac1a4ba657717fcb17222cc14d4a3720c8.tar.gz
bcm5719-llvm-22653bac1a4ba657717fcb17222cc14d4a3720c8.zip
Declare and define implicit move constructor and assignment operator.
This makes the code duplication of implicit special member handling even worse, but the cleanup will have to come later. For now, this works. Follow-up with tests for explicit defaulting and enabling the __has_feature flag to come. llvm-svn: 138821
Diffstat (limited to 'clang/lib/CodeGen/CGExprConstant.cpp')
-rw-r--r--clang/lib/CodeGen/CGExprConstant.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp
index d2e5bc2a24c..1ac0c58d2aa 100644
--- a/clang/lib/CodeGen/CGExprConstant.cpp
+++ b/clang/lib/CodeGen/CGExprConstant.cpp
@@ -789,8 +789,8 @@ public:
if (E->getNumArgs()) {
assert(E->getNumArgs() == 1 && "trivial ctor with > 1 argument");
- assert(E->getConstructor()->isCopyConstructor() &&
- "trivial ctor has argument but isn't a copy ctor");
+ assert(E->getConstructor()->isCopyOrMoveConstructor() &&
+ "trivial ctor has argument but isn't a copy/move ctor");
Expr *Arg = E->getArg(0);
assert(CGM.getContext().hasSameUnqualifiedType(Ty, Arg->getType()) &&
OpenPOWER on IntegriCloud