Make the CXXConstructExpr public and add a StmtClass to it. No functionality change.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@69954 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 9 insertions, 7 deletions

diff --git a/include/clang/AST/ExprCXX.h b/include/clang/AST/ExprCXX.h
index 7daaa8abbc..9d3710a2a6 100644
--- a/include/clang/AST/ExprCXX.h
+++ b/include/clang/AST/ExprCXX.h
@@ -379,7 +379,6 @@ public:
   virtual child_iterator child_end();
 };
 
-
 /// CXXConstructExpr - Represents a call to a C++ constructor.
 class CXXConstructExpr : public Expr {
   VarDecl *VD;
@@ -390,11 +389,13 @@ class CXXConstructExpr : public Expr {
   Stmt **Args;
   unsigned NumArgs;
 
-  CXXConstructExpr(ASTContext &C, VarDecl *vd, QualType T, 
-                   CXXConstructorDecl *d, bool elidable,
-                   Expr **args, unsigned numargs);
   ~CXXConstructExpr() { } 
   
+protected:
+  CXXConstructExpr(ASTContext &C, StmtClass SC, VarDecl *vd, QualType T, 
+                   CXXConstructorDecl *d, bool elidable,
+                   Expr **args, unsigned numargs);
+
 public:
   static CXXConstructExpr *Create(ASTContext &C, VarDecl *VD, QualType T,
                                   CXXConstructorDecl *D, bool Elidable, 
diff --git a/lib/AST/ExprCXX.cpp b/lib/AST/ExprCXX.cpp
index 1e96395d46..e0a988bf66 100644
--- a/lib/AST/ExprCXX.cpp
+++ b/lib/AST/ExprCXX.cpp
@@ -258,14 +258,15 @@ CXXConstructExpr *CXXConstructExpr::Create(ASTContext &C, VarDecl *VD,
                                            QualType T, CXXConstructorDecl *D,  
                                            bool Elidable,
                                            Expr **Args, unsigned NumArgs) {
-  return new (C) CXXConstructExpr(C, VD, T, D, Elidable, Args, NumArgs);
+  return new (C) CXXConstructExpr(C, CXXConstructExprClass, VD, T, D, Elidable, 
+                                  Args, NumArgs);
 }
 
-CXXConstructExpr::CXXConstructExpr(ASTContext &C, VarDecl *vd, 
+CXXConstructExpr::CXXConstructExpr(ASTContext &C, StmtClass SC, VarDecl *vd, 
                                    QualType T, CXXConstructorDecl *D, 
                                    bool elidable,
                                    Expr **args, unsigned numargs) 
-: Expr(CXXConstructExprClass, T,
+: Expr(SC, T,
        T->isDependentType(),
        (T->isDependentType() ||
         CallExpr::hasAnyValueDependentArguments(args, numargs))),