commit a5d06285584d8c5d4db1ebe09e6c48536b37794d
author Douglas Gregor <doug.gregor@gmail.com> Sat Aug 08 01:41:12 2009 +0000
committer Douglas Gregor <doug.gregor@gmail.com> Sat Aug 08 01:41:12 2009 +0000
tree d788e8c42f7e7838e8a707e93e0bbb307197f9a7
parent fbe08772af9f0789452a95791812b6300d78af79

Introduce reference counting for statements and expressions, using it
to allow sharing of nodes. Simplifies some aspects of template
instantiation, and fixes both PR3444 and <rdar://problem/6757457>.


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

lib/Sema/Sema.h

diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index 6094e6d..295607b 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -2821,14 +2821,6 @@
 
   NamedDecl *InstantiateCurrentDeclRef(NamedDecl *D);
     
-  // Simple function for cloning expressions.
-  template<typename T> 
-  OwningExprResult Clone(T *E) {
-    assert(!E->isValueDependent() && !E->isTypeDependent() &&
-           "expression is value or type dependent!");
-    return Owned(E->Clone(Context));
-  }
-  
   // Objective-C declarations.
   virtual DeclPtrTy ActOnStartClassInterface(SourceLocation AtInterfaceLoc,
                                              IdentifierInfo *ClassName,

lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 021a6ad..1c98fca 100644
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -222,7 +222,8 @@
   if (InstantiatedAssertExpr.isInvalid())
     return 0;
 
-  OwningExprResult Message = SemaRef.Clone(D->getMessage());
+  OwningExprResult Message(SemaRef, D->getMessage());
+  D->getMessage()->Retain();
   Decl *StaticAssert 
     = SemaRef.ActOnStaticAssertDeclaration(D->getLocation(), 
                                            move(InstantiatedAssertExpr),

lib/Sema/SemaTemplateInstantiateExpr.cpp

diff --git a/lib/Sema/SemaTemplateInstantiateExpr.cpp b/lib/Sema/SemaTemplateInstantiateExpr.cpp
index 2e7ed1a..1e97f5f 100644
--- a/lib/Sema/SemaTemplateInstantiateExpr.cpp
+++ b/lib/Sema/SemaTemplateInstantiateExpr.cpp
@@ -57,53 +57,53 @@
 
 Sema::OwningExprResult
 TemplateExprInstantiator::VisitPredefinedExpr(PredefinedExpr *E) {
-  return SemaRef.Clone(E);
+  return SemaRef.Owned(E->Retain());
 }
 
 Sema::OwningExprResult
 TemplateExprInstantiator::VisitIntegerLiteral(IntegerLiteral *E) {
-  return SemaRef.Clone(E);
+  return SemaRef.Owned(E->Retain());
 }
 
 Sema::OwningExprResult
 TemplateExprInstantiator::VisitFloatingLiteral(FloatingLiteral *E) {
-  return SemaRef.Clone(E);
+  return SemaRef.Owned(E->Retain());
 }
 
 Sema::OwningExprResult
 TemplateExprInstantiator::VisitStringLiteral(StringLiteral *E) {
-  return SemaRef.Clone(E);
+  return SemaRef.Owned(E->Retain());
 }
 
 Sema::OwningExprResult
 TemplateExprInstantiator::VisitCharacterLiteral(CharacterLiteral *E) {
-  return SemaRef.Clone(E);
+  return SemaRef.Owned(E->Retain());
 }
 
 Sema::OwningExprResult 
 TemplateExprInstantiator::VisitImaginaryLiteral(ImaginaryLiteral *E) {
-  return SemaRef.Clone(E);
+  return SemaRef.Owned(E->Retain());
 }
 
 Sema::OwningExprResult
 TemplateExprInstantiator::VisitCXXBoolLiteralExpr(CXXBoolLiteralExpr *E) {
-  return SemaRef.Clone(E);
+  return SemaRef.Owned(E->Retain());
 }
 
 Sema::OwningExprResult
 TemplateExprInstantiator::VisitCXXNullPtrLiteralExpr(CXXNullPtrLiteralExpr *E) {
-  return SemaRef.Clone(E);
+  return SemaRef.Owned(E->Retain());
 }
 
 Sema::OwningExprResult
 TemplateExprInstantiator::VisitGNUNullExpr(GNUNullExpr *E) {
-  return SemaRef.Clone(E);
+  return SemaRef.Owned(E->Retain());
 }
 
 Sema::OwningExprResult 
 TemplateExprInstantiator::VisitUnresolvedFunctionNameExpr(
                                               UnresolvedFunctionNameExpr *E) {
-  return SemaRef.Clone(E);
+  return SemaRef.Owned(E->Retain());
 }
 
 Sema::OwningExprResult
@@ -706,7 +706,8 @@
                                                   ImplicitValueInitExpr *E) {
   assert(!E->isTypeDependent() && !E->isValueDependent() &&
          "ImplicitValueInitExprs are never dependent");
-  return SemaRef.Clone(E);
+  E->Retain();
+  return SemaRef.Owned(E);
 }
 
 Sema::OwningExprResult 
@@ -1110,7 +1111,7 @@
 
 Sema::OwningExprResult 
 TemplateExprInstantiator::VisitCXXZeroInitValueExpr(CXXZeroInitValueExpr *E) {
-  return SemaRef.Clone(E);
+  return SemaRef.Owned(E->Retain());
 }
 
 Sema::OwningExprResult 
@@ -1289,7 +1290,7 @@
 //----------------------------------------------------------------------------
 Sema::OwningExprResult 
 TemplateExprInstantiator::VisitObjCStringLiteral(ObjCStringLiteral *E) {
-  return SemaRef.Owned(E->Clone(SemaRef.Context));
+  return SemaRef.Owned(E->Retain());
 }
 
 Sema::OwningExprResult 
@@ -1314,12 +1315,12 @@
 
 Sema::OwningExprResult 
 TemplateExprInstantiator::VisitObjCSelectorExpr(ObjCSelectorExpr *E) { 
-  return SemaRef.Owned(E->Clone(SemaRef.Context));
+  return SemaRef.Owned(E->Retain());
 }
 
 Sema::OwningExprResult 
 TemplateExprInstantiator::VisitObjCProtocolExpr(ObjCProtocolExpr *E) { 
-  return SemaRef.Owned(E->Clone(SemaRef.Context));
+  return SemaRef.Owned(E->Retain());
 }
 
 Sema::OwningExprResult