Make CXXTemporaryObjectExpr inherit from CXXConstructExpr.

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

diff --git a/include/clang/AST/ExprCXX.h b/include/clang/AST/ExprCXX.h
index 631c5598023949f467fe936a1acb2d44e5b7dde8..c3e018132484f42a512651a1d48df1e40f1f10ed 100644 (file)
--- a/include/clang/AST/ExprCXX.h
+++ b/include/clang/AST/ExprCXX.h
@@ -389,12 +389,12 @@ class CXXConstructExpr : public Expr {
   Stmt **Args;
   unsigned NumArgs;
 
-  ~CXXConstructExpr() { } 
   
 protected:
   CXXConstructExpr(ASTContext &C, StmtClass SC, VarDecl *vd, QualType T, 
                    CXXConstructorDecl *d, bool elidable,
                    Expr **args, unsigned numargs);
+  ~CXXConstructExpr() { } 
 
 public:
   static CXXConstructExpr *Create(ASTContext &C, VarDecl *VD, QualType T,
@@ -419,7 +419,8 @@ public:
   virtual SourceRange getSourceRange() const { return SourceRange(); }
 
   static bool classof(const Stmt *T) { 
-    return T->getStmtClass() == CXXConstructExprClass;
+    return T->getStmtClass() == CXXConstructExprClass ||
+      T->getStmtClass() == CXXTemporaryObjectExprClass;
   }
   static bool classof(const CXXConstructExpr *) { return true; }
   
@@ -472,12 +473,9 @@ public:
 ///   return X(1, 3.14f); // creates a CXXTemporaryObjectExpr
 /// };
 /// @endcode
-class CXXTemporaryObjectExpr : public Expr {
+class CXXTemporaryObjectExpr : public CXXConstructExpr {
   SourceLocation TyBeginLoc;
   SourceLocation RParenLoc;
-  CXXConstructorDecl *Constructor;
-  Stmt **Args;
-  unsigned NumArgs;
 
 public:
   CXXTemporaryObjectExpr(ASTContext &C, VarDecl *vd, 
@@ -485,23 +483,11 @@ public:
                          SourceLocation tyBeginLoc, Expr **Args,
                          unsigned NumArgs, SourceLocation rParenLoc);
 
-  ~CXXTemporaryObjectExpr();
+  ~CXXTemporaryObjectExpr() { } 
 
   SourceLocation getTypeBeginLoc() const { return TyBeginLoc; }
   SourceLocation getRParenLoc() const { return RParenLoc; }
-  
-  typedef ExprIterator arg_iterator;
-  typedef ConstExprIterator const_arg_iterator;
-    
-  arg_iterator arg_begin() { return Args; }
-  arg_iterator arg_end() { return Args + NumArgs; }
-  const_arg_iterator arg_begin() const { return Args; }
-  const_arg_iterator arg_end() const { return Args + NumArgs; }
-  
-  unsigned getNumArgs() const { return NumArgs; }
 
-  const CXXConstructorDecl* getConstructor() const { return Constructor; }
-  
   virtual SourceRange getSourceRange() const {
     return SourceRange(TyBeginLoc, RParenLoc);
   }
@@ -509,10 +495,6 @@ public:
     return T->getStmtClass() == CXXTemporaryObjectExprClass;
   }
   static bool classof(const CXXTemporaryObjectExpr *) { return true; }
-  
-  // Iterators
-  virtual child_iterator child_begin();
-  virtual child_iterator child_end();
 };
 
 /// CXXZeroInitValueExpr - [C++ 5.2.3p2]

diff --git a/lib/AST/ExprCXX.cpp b/lib/AST/ExprCXX.cpp
index b109d7a840c7c4b36782ac22285a3aaf66a2158c..5b4d4d330e3a6524e60490e890cde1438cb0cfa4 100644 (file)
--- a/lib/AST/ExprCXX.cpp
+++ b/lib/AST/ExprCXX.cpp
@@ -63,14 +63,6 @@ Stmt::child_iterator CXXDefaultArgExpr::child_end() {
   return child_iterator();
 }
 
-// CXXTemporaryObjectExpr
-Stmt::child_iterator CXXTemporaryObjectExpr::child_begin() { 
-  return child_iterator(Args);
-}
-Stmt::child_iterator CXXTemporaryObjectExpr::child_end() {
-  return child_iterator(Args + NumArgs);
-}
-
 // CXXZeroInitValueExpr
 Stmt::child_iterator CXXZeroInitValueExpr::child_begin() { 
   return child_iterator();
@@ -238,21 +230,9 @@ CXXTemporaryObjectExpr::CXXTemporaryObjectExpr(ASTContext &C, VarDecl *vd,
                                                Expr **Args,
                                                unsigned NumArgs, 
                                                SourceLocation rParenLoc)
-  : Expr(CXXTemporaryObjectExprClass, writtenTy,
-         writtenTy->isDependentType(),
-         (writtenTy->isDependentType() ||
-          CallExpr::hasAnyValueDependentArguments(Args, NumArgs))),
-    TyBeginLoc(tyBeginLoc), RParenLoc(rParenLoc),
-    Constructor(Cons), Args(0), NumArgs(NumArgs) {
-  if (NumArgs > 0) {
-    this->Args = new Stmt*[NumArgs];
-    for (unsigned i = 0; i < NumArgs; ++i)
-      this->Args[i] = Args[i];
-  }
-}
-
-CXXTemporaryObjectExpr::~CXXTemporaryObjectExpr() {
-  delete [] Args;
+  : CXXConstructExpr(C, CXXTemporaryObjectExprClass, vd, writtenTy, Cons, 
+                     false, Args, NumArgs), 
+  TyBeginLoc(tyBeginLoc), RParenLoc(rParenLoc) {
 }
 
 CXXConstructExpr *CXXConstructExpr::Create(ASTContext &C, VarDecl *VD,