Changes in src/AST/Convert.cpp [665f432:ae265b55]

File:

• src/AST/Convert.cpp (modified) (6 diffs)

src/AST/Convert.cpp

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Thu May 09 15::37::05 2019
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 25 22:21:46 2019
-// Update Count     : 13
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jun 17 16:44:00 2019
+// Update Count     : 12
 //
 
@@ -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);
         }
@@ -887 +898 @@
                 auto expr = visitBaseExpr( node,
                         new AsmExpr(
-                                new std::string(node->inout),
+                                get<Expression>().accept1(node->inout),
                                 get<Expression>().accept1(node->constraint),
                                 get<Expression>().accept1(node->operand)
@@ -2113 +2124 @@
                                 old->location,
                                 GET_ACCEPT_1(member, DeclWithType),
-                                GET_ACCEPT_1(aggregate, Expr)
+                                GET_ACCEPT_1(aggregate, Expr),
+                                ast::MemberExpr::NoOpConstructionChosen
                         )
                 );
@@ -2258 +2270 @@
                         new ast::AsmExpr(
                                 old->location,
-                                old->inout,
+                                GET_ACCEPT_1(inout, Expr),
                                 GET_ACCEPT_1(constraint, Expr),
                                 GET_ACCEPT_1(operand, Expr)
@@ -2676 +2688 @@
                 );
         }
+
+        virtual void visit( const AttrExpr * ) override final {
+                assertf( false, "AttrExpr deprecated in new AST." );
+        }
 };