Changeset 6943a987 for src/SymTab/Validate.cc

Timestamp:

Aug 29, 2016, 10:33:05 AM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

5e644d3e

Parents:

79841be (diff), 413ad05 (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/SymTab/Validate.cc (modified) (5 diffs)

src/SymTab/Validate.cc

@@ -58 +58 @@
 #include "Autogen.h"
 #include "ResolvExpr/typeops.h"
+#include <algorithm>
 
 #define debugPrint( x ) if ( doDebug ) { std::cout << x; }
@@ -162 +163 @@
 
                 typedef std::map< std::string, std::pair< TypedefDecl *, int > > TypedefMap;
+                typedef std::map< std::string, TypeDecl * > TypeDeclMap;
                 TypedefMap typedefNames;
+                TypeDeclMap typedeclNames;
                 int scopeLevel;
         };
@@ -370 +373 @@
                 } // if
 
-                applySubstitution( ctx->get_parameters().begin(), ctx->get_parameters().end(), contextInst->get_parameters().begin(), ctx->get_members().begin(), ctx->get_members().end(), back_inserter( contextInst->get_members() ) );
+                // need to clone members of the context for ownership purposes
+                std::list< Declaration * > members;
+                std::transform( ctx->get_members().begin(), ctx->get_members().end(), back_inserter( members ), [](Declaration * dwt) { return dwt->clone(); } );
+
+                applySubstitution( ctx->get_parameters().begin(), ctx->get_parameters().end(), contextInst->get_parameters().begin(), members.begin(), members.end(), back_inserter( contextInst->get_members() ) );
         }
 
@@ -521 +528 @@
                         delete typeInst;
                         return ret;
+                } else {
+                        TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
+                        assert( base != typedeclNames.end() );
+                        typeInst->set_baseType( base->second->clone() );
                 } // if
                 return typeInst;
@@ -565 +576 @@
                         typedefNames.erase( i ) ;
                 } // if
+
+                typedeclNames[ typeDecl->get_name() ] = typeDecl;
                 return typeDecl;
         }