Changeset 13f066d for src/InitTweak/FixInitNew.cpp

Timestamp:

Mar 4, 2023, 1:35:31 PM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

231e1ae

Parents:

1e38178 (diff), a8667ab (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 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/InitTweak/FixInitNew.cpp (modified) (3 diffs)

src/InitTweak/FixInitNew.cpp

@@ -107 +107 @@
         private:
                 /// hack to implement WithTypeSubstitution while conforming to mutation safety.
-                ast::TypeSubstitution * env;
-                bool                    envModified;
+                ast::TypeSubstitution * env         = nullptr;
+                bool                    envModified = false;
         };
 
@@ -522 +522 @@
         {
                 static UniqueName tempNamer("_tmp_cp");
-                assert( env );
                 const CodeLocation loc = impCpCtorExpr->location;
                 // CP_CTOR_PRINT( std::cerr << "Type Substitution: " << *env << std::endl; )
@@ -534 +533 @@
 
                 // xxx - this originally mutates arg->result in place. is it correct?
+                assert( env );
                 result = env->applyFree( result.get() ).node;
                 auto mutResult = result.get_and_mutate();