summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2009-06-01 00:26:14 +0000
committerAnders Carlsson <andersca@mac.com>2009-06-01 00:26:14 +0000
commitfa7c608eccdf0e836d0b3391d7235a1bb20007b1 (patch)
treed9a02d96b9d3345b949c0297932e16f54e3174e4
parentca50119a31d335b46dcc9940f6f6fd6cabe8ea33 (diff)
downloadbcm5719-llvm-fa7c608eccdf0e836d0b3391d7235a1bb20007b1.tar.gz
bcm5719-llvm-fa7c608eccdf0e836d0b3391d7235a1bb20007b1.zip
Fix a thinko.
llvm-svn: 72679
-rw-r--r--clang/lib/CodeGen/CGCXX.cpp2
-rw-r--r--clang/test/CodeGenCXX/new.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGCXX.cpp b/clang/lib/CodeGen/CGCXX.cpp
index 32152f96bf0..731e38c5146 100644
--- a/clang/lib/CodeGen/CGCXX.cpp
+++ b/clang/lib/CodeGen/CGCXX.cpp
@@ -315,7 +315,7 @@ llvm::Value *CodeGenFunction::EmitCXXNewExpr(const CXXNewExpr *E) {
NewPtr = Builder.CreateBitCast(NewPtr, ConvertType(E->getType()));
if (AllocType->isPODType()) {
- if (E->hasInitializer()) {
+ if (E->getNumConstructorArgs() > 0) {
assert(E->getNumConstructorArgs() == 1 &&
"Can only have one argument to initializer of POD type.");
diff --git a/clang/test/CodeGenCXX/new.cpp b/clang/test/CodeGenCXX/new.cpp
index 70ad269d24a..480bbcefc08 100644
--- a/clang/test/CodeGenCXX/new.cpp
+++ b/clang/test/CodeGenCXX/new.cpp
@@ -50,3 +50,7 @@ int *t6() {
// Null check.
return new (0) int(10);
}
+
+void t7() {
+ new int();
+}
OpenPOWER on IntegriCloud