Changeset 6c2ba38 for src/GenPoly

Timestamp:

Nov 28, 2017, 3:52:06 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, 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:

383e159, 8d5b9cf

Parents:

cf966b5 (diff), 8a0a64d9 (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

Location:

src/GenPoly

Files:

• Box.cc (modified) (1 diff)
• InstantiateGeneric.cc (modified) (1 diff)

src/GenPoly/Box.cc

@@ -855 +855 @@
                         DeclarationWithType *adapteeDecl = adapterType->get_parameters().front();
                         adapteeDecl->set_name( "_adaptee" );
+                        // do not carry over attributes to real type parameters/return values
+                        for ( DeclarationWithType * dwt : realType->parameters ) {
+                                deleteAll( dwt->get_type()->attributes );
+                                dwt->get_type()->attributes.clear();
+                        }
+                        for ( DeclarationWithType * dwt : realType->returnVals ) {
+                                deleteAll( dwt->get_type()->attributes );
+                                dwt->get_type()->attributes.clear();
+                        }
                         ApplicationExpr *adapteeApp = new ApplicationExpr( new CastExpr( new VariableExpr( adapteeDecl ), new PointerType( Type::Qualifiers(), realType ) ) );
                         Statement *bodyStmt;

src/GenPoly/InstantiateGeneric.cc

@@ -210 +210 @@
                 PassVisitor<GenericInstantiator> instantiator;
 
-                mutateAll( translationUnit, fixer );
+                // mutateAll( translationUnit, fixer );
                 mutateAll( translationUnit, instantiator );
         }