Changeset 2162c2c for src/CodeGen

Timestamp:

Jan 11, 2017, 4:11:02 PM (9 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:

075734f

Parents:

bb82c03 (diff), d3a85240 (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/CodeGen

Files:

• CodeGenerator.cc (modified) (1 diff)
• CodeGenerator.h (modified) (1 diff)
• GenType.cc (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -656 +656 @@
         }
 
-        void CodeGenerator::visit( TupleExpr * tupleExpr ) { assert( false ); }
+        void CodeGenerator::visit( UntypedTupleExpr * tupleExpr ) { assertf( false, "UntypedTupleExpr should not make it to Code Gen" ); }
+
+        void CodeGenerator::visit( TupleExpr * tupleExpr ) { assertf( false, "TupleExpr should not make it to Code Gen" ); }
 
         void CodeGenerator::visit( TypeExpr * typeExpr ) {}

src/CodeGen/CodeGenerator.h

@@ -72 +72 @@
                 virtual void visit( CommaExpr *commaExpr );
                 virtual void visit( CompoundLiteralExpr *compLitExpr );
+                virtual void visit( UntypedTupleExpr *tupleExpr );
                 virtual void visit( TupleExpr *tupleExpr );
                 virtual void visit( TypeExpr *typeExpr );

src/CodeGen/GenType.cc

@@ -41 +41 @@
                 virtual void visit( EnumInstType *enumInst );
                 virtual void visit( TypeInstType *typeInst );
+                virtual void visit( TupleType * tupleType );
                 virtual void visit( VarArgsType *varArgsType );
                 virtual void visit( ZeroType *zeroType );
@@ -197 +198 @@
         }
 
+        void GenType::visit( TupleType * tupleType ) {
+                assertf( ! mangle, "Tuple types should not make it to Code Gen." );
+                Visitor::visit( tupleType );
+        }
+
         void GenType::visit( VarArgsType *varArgsType ) {
                 typeString = "__builtin_va_list " + typeString;