Changeset 4eb43fa

Timestamp:

Jul 22, 2019, 4:23:33 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

96ac72c

Parents:

f53acdf8 (diff), f6cc734e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'new-ast' of plg.uwaterloo.ca:software/cfa/cfa-cc into new-ast

Location:

src

Files:

• AST/Attribute.hpp (modified) (1 diff)
• AST/Convert.cpp (modified) (1 diff)
• AST/Copy.hpp (modified) (3 diffs)
• AST/Decl.hpp (modified) (1 diff)
• AST/Expr.hpp (modified) (1 diff)
• AST/Init.hpp (modified) (1 diff)
• AST/Node.hpp (modified) (1 diff)
• AST/Stmt.hpp (modified) (1 diff)
• AST/Type.hpp (modified) (1 diff)
• ResolvExpr/RenameVars.cc (modified) (2 diffs)

src/AST/Attribute.hpp

@@ -51 +51 @@
         template<typename node_t>
         friend node_t * mutate(const node_t * node);
+        template<typename node_t>
+    friend node_t * shallowCopy(const node_t * node);
 };
 

src/AST/Convert.cpp

@@ -608 +608 @@
 
                 tgt->result = get<Type>().accept1(src->result);
+                // Unconditionally use a clone of the result type.
+                // We know this will leak some objects: much of the immediate conversion result.
+                // In some cases, using the conversion result directly gives unintended object sharing.
+                // A parameter (ObjectDecl, a child of a FunctionType) is shared by the weak-ref cache.
+                // But tgt->result must be fully owned privately by tgt.
+                // Applying these conservative copies here means
+                // - weak references point at the declaration's copy, not these expr.result copies (good)
+                // - we copy more objects than really needed (bad, tolerated)
+                if (tgt->result) {
+                        tgt->result = tgt->result->clone();
+                }
                 return visitBaseExpr_skipResultType(src, tgt);
         }

src/AST/Copy.hpp

@@ -23 +23 @@
 
 template<typename node_t>
-const node_t * shallowCopy( const node_t * node ) {
+node_t * shallowCopy( const node_t * node );
 /* Create a shallow copy of the node given.
  *
@@ -31 +31 @@
 
 template<typename node_t>
-node_t * deepCopy( node_t const * localRoot );
+node_t * deepCopy( const node_t * localRoot );
 /* Create a deep copy of the tree rooted at localRoot.
  *
@@ -106 +106 @@
 
 template<typename node_t>
-node_t * shallowCopy( node_t const * localRoot ) {
+node_t * shallowCopy( const node_t * localRoot ) {
         return localRoot->clone();
 }
 
 template<typename node_t>
-node_t * deepCopy( node_t const * localRoot ) {
+node_t * deepCopy( const node_t * localRoot ) {
         Pass< DeepCopyCore > dc;
         node_t const * newRoot = localRoot->accept( dc );

src/AST/Decl.hpp

@@ -32 +32 @@
 
 // Must be included in *all* AST classes; should be #undef'd at the end of the file
-#define MUTATE_FRIEND template<typename node_t> friend node_t * mutate(const node_t * node);
+#define MUTATE_FRIEND \
+    template<typename node_t> friend node_t * mutate(const node_t * node); \
+        template<typename node_t> friend node_t * shallowCopy(const node_t * node);
 
 namespace ast {

src/AST/Expr.hpp

@@ -30 +30 @@
 
 // Must be included in *all* AST classes; should be #undef'd at the end of the file
-#define MUTATE_FRIEND template<typename node_t> friend node_t * mutate(const node_t * node);
+#define MUTATE_FRIEND \
+    template<typename node_t> friend node_t * mutate(const node_t * node); \
+        template<typename node_t> friend node_t * shallowCopy(const node_t * node);
+
 
 class ConverterOldToNew;

src/AST/Init.hpp

@@ -25 +25 @@
 
 // Must be included in *all* AST classes; should be #undef'd at the end of the file
-#define MUTATE_FRIEND template<typename node_t> friend node_t * mutate(const node_t * node);
+#define MUTATE_FRIEND \
+    template<typename node_t> friend node_t * mutate(const node_t * node); \
+        template<typename node_t> friend node_t * shallowCopy(const node_t * node);
 
 namespace ast {

src/AST/Node.hpp

@@ -57 +57 @@
         template<typename node_t>
         friend node_t * mutate(const node_t * node);
+        template<typename node_t>
+        friend node_t * shallowCopy(const node_t * node);
 
         mutable size_t strong_count = 0;

src/AST/Stmt.hpp

@@ -27 +27 @@
 
 // Must be included in *all* AST classes; should be #undef'd at the end of the file
-#define MUTATE_FRIEND template<typename node_t> friend node_t * mutate(const node_t * node);
+#define MUTATE_FRIEND \
+    template<typename node_t> friend node_t * mutate(const node_t * node); \
+        template<typename node_t> friend node_t * shallowCopy(const node_t * node);
 
 namespace ast {

src/AST/Type.hpp

@@ -30 +30 @@
 
 // Must be included in *all* AST classes; should be #undef'd at the end of the file
-#define MUTATE_FRIEND template<typename node_t> friend node_t * mutate(const node_t * node);
+#define MUTATE_FRIEND \
+    template<typename node_t> friend node_t * mutate(const node_t * node); \
+        template<typename node_t> friend node_t * shallowCopy(const node_t * node);
 
 namespace ast {

src/ResolvExpr/RenameVars.cc

@@ -30 +30 @@
 #include "SynTree/Type.h"          // for Type, TypeInstType, TraitInstType
 #include "SynTree/Visitor.h"       // for acceptAll, maybeAccept
+
+#include "AST/Copy.hpp"
 
 namespace ResolvExpr {
@@ -172 +174 @@
 
 const ast::Type * renameTyVars( const ast::Type * t ) {
+        ast::Type *tc = ast::deepCopy(t);
         ast::Pass<RenameVars_new> renamer;
-        return t->accept( renamer );
+//      return t->accept( renamer );
+        return tc->accept( renamer );
 }