3 files changed, 14 insertions, 6 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index c964daf6fd..d71417b957 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -1996,12 +1996,6 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC,
     } else if (FTI.NumArgs > 0 && FTI.ArgInfo[0].Param != 0) {
       for (unsigned i = 0, e = FTI.NumArgs; i != e; ++i) {
         ParmVarDecl *PVD = (ParmVarDecl *)FTI.ArgInfo[i].Param;
-        
-        // Function parameters cannot have abstract class types.
-        if (RequireNonAbstractType(PVD->getLocation(), PVD->getType(),
-                                   diag::err_abstract_type_in_decl, 
-                                   1 /* parameter type */))
-            InvalidDecl = true;
         Params.push_back(PVD);
       }
     }
@@ -2611,6 +2605,13 @@ Sema::ActOnParamDeclarator(Scope *S, Declarator &D) {
   // FIXME: If a source translation tool needs to see the original type, then
   // we need to consider storing both types (in ParmVarDecl)...
   // 
+  
+  // Parameters can not be abstract class types.
+  if (RequireNonAbstractType(D.getIdentifierLoc(), parmDeclType, 
+                             diag::err_abstract_type_in_decl,
+                             1 /* parameter type */)) 
+    D.setInvalidType(true);
+  
   if (parmDeclType->isArrayType()) {
     // int x[restrict 4] ->  int *restrict
     parmDeclType = Context.getArrayDecayedType(parmDeclType);
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index ad2dba7ce4..6f33c00526 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -788,6 +788,9 @@ bool Sema::RequireNonAbstractType(SourceLocation Loc, QualType T,
   
   if (!getLangOptions().CPlusPlus)
     return false;
+  
+  if (const ArrayType *AT = Context.getAsArrayType(T))
+    return RequireNonAbstractType(Loc, AT->getElementType(), DiagID, SelID);
     
   const RecordType *RT = T->getAsRecordType();
   if (!RT)
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index ac36a1f22d..271f1da3ad 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -197,6 +197,10 @@ Sema::ActOnCXXTypeConstructExpr(SourceRange TypeRange, TypeTy *TypeRep,
                           diag::err_invalid_incomplete_type_use, FullRange))
     return ExprError();
 
+  if (RequireNonAbstractType(TyBeginLoc, Ty, 
+                             diag::err_allocation_of_abstract_type, 0))
+    return ExprError();
+  
   exprs.release();
   return Owned(new (Context) CXXZeroInitValueExpr(Ty, TyBeginLoc, RParenLoc));
 }