Changes in src/GenPoly/InstantiateGeneric.cc [e3e16bc:f6582243]

File:

• src/GenPoly/InstantiateGeneric.cc (modified) (2 diffs)

src/GenPoly/InstantiateGeneric.cc

@@ -13 +13 @@
 // Update Count     : 1
 //
+
+#include <cassert>
+#include <list>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
 #include "InstantiateGeneric.h"
 
-#include <cassert>                     // for assertf, assert
-#include <iterator>                    // for back_inserter, inserter
-#include <list>                        // for list, _List_const_iterator
-#include <utility>                     // for move, pair
-#include <vector>                      // for vector
-
-#include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
-#include "Common/ScopedMap.h"          // for ScopedMap
-#include "Common/SemanticError.h"      // for SemanticError
-#include "Common/UniqueName.h"         // for UniqueName
-#include "Common/utility.h"            // for deleteAll, cloneAll
-#include "GenPoly.h"                   // for isPolyType, typesPolyCompatible
-#include "ScopedSet.h"                 // for ScopedSet, ScopedSet<>::iterator
-#include "ScrubTyVars.h"               // for ScrubTyVars
-#include "SynTree/Declaration.h"       // for StructDecl, UnionDecl, TypeDecl
-#include "SynTree/Expression.h"        // for TypeExpr, Expression
-#include "SynTree/Mutator.h"           // for mutateAll
-#include "SynTree/Type.h"              // for StructInstType, UnionInstType
-#include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
-#include "SynTree/Visitor.h"           // for acceptAll
+#include "GenPoly.h"
+#include "ScopedSet.h"
+#include "ScrubTyVars.h"
+
+#include "Common/PassVisitor.h"
+#include "Common/ScopedMap.h"
+#include "Common/UniqueName.h"
+#include "Common/utility.h"
+
+#include "ResolvExpr/typeops.h"
+
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Type.h"
+
+
+#include "InitTweak/InitTweak.h"
 
 
@@ -459 +463 @@
                         Declaration * member = *std::next( aggr->members.begin(), memberIndex );
                         assertf( member->name == memberExpr->member->name, "Instantiation has different member order than the generic type. %s / %s", toString( member ).c_str(), toString( memberExpr->member ).c_str() );
-                        DeclarationWithType * field = strict_dynamic_cast< DeclarationWithType * >( member );
+                        DeclarationWithType * field = safe_dynamic_cast< DeclarationWithType * >( member );
                         MemberExpr * ret = new MemberExpr( field, memberExpr->aggregate->clone() );
                         std::swap( ret->env, memberExpr->env );