Changeset 136ccd7 for src/GenPoly

Timestamp:

Nov 3, 2017, 3:01:31 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

4ee36bf0

Parents:

4ee1efb (diff), 760ba67 (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' into cleanup-dtors

Location:

src/GenPoly

Files:

• InstantiateGeneric.cc (modified) (2 diffs)
• ScrubTyVars.cc (modified) (1 diff)

src/GenPoly/InstantiateGeneric.cc

@@ -238 +238 @@
                                         assertf( false, "Ttype parameters are not currently allowed as parameters to generic types." );
                                         break;
-                                case TypeDecl::Any:
-                                        assertf( false, "otype parameters handled by baseParam->isComplete()." );
+                                default:
+                                        assertf( false, "Unhandled type parameter kind" );
                                         break;
                         }
@@ -278 +278 @@
                 substituteMembers( base->get_members(), baseParams, typeSubs );
 
-                deleteAll( baseParams );
+                // xxx - can't delete type parameters because they may have assertions that are used
+                // deleteAll( baseParams );
                 baseParams.clear();
 

src/GenPoly/ScrubTyVars.cc

@@ -40 +40 @@
                 if ( tyVar != tyVars->end() ) {
                         switch ( tyVar->second.kind ) {
-                          case TypeDecl::Any:
                           case TypeDecl::Dtype:
                           case TypeDecl::Ttype: