Changeset 70a06f6 for src/CodeGen

Timestamp:

Apr 14, 2016, 4:13:10 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

356189a

Parents:

db4ecc5 (diff), 37f0da8 (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 ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Parser/DeclarationNode.cc
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/AddVisit.h
src/SymTab/Validate.cc
src/SynTree/Expression.cc
src/SynTree/Expression.h
src/SynTree/Mutator.cc
src/SynTree/Mutator.h
src/SynTree/SynTree.h
src/SynTree/Visitor.cc
src/SynTree/Visitor.h
src/libcfa/iostream.c

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (3 diffs)
• CodeGenerator.h (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Apr 11 15:30:52 2016
+// Last Modified On : Thu Apr 14 15:40:00 2016
 // Update Count     : 255
 //
@@ -485 +485 @@
 
         void CodeGenerator::visit( UntypedOffsetofExpr *offsetofExpr ) {
-                assert( false );
+                assert( false && "UntypedOffsetofExpr should not reach code generation" );
         }
 
@@ -494 +494 @@
                 output << ", " << mangleName( offsetofExpr->get_member() );
                 output << ")";
+        }
+
+        void CodeGenerator::visit( OffsetPackExpr *offsetPackExpr ) {
+                assert( false && "OffsetPackExpr should not reach code generation" );
         }
 

src/CodeGen/CodeGenerator.h

@@ -65 +65 @@
                 virtual void visit( UntypedOffsetofExpr *offsetofExpr );
                 virtual void visit( OffsetofExpr *offsetofExpr );
+                virtual void visit( OffsetPackExpr *offsetPackExpr );
                 virtual void visit( LogicalExpr *logicalExpr );
                 virtual void visit( ConditionalExpr *conditionalExpr );