Changeset d63eeb0 for src/CodeGen

Timestamp:

Feb 9, 2016, 3:25:05 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:

7528ba1

Parents:

771b3c3 (diff), bd85400 (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/Makefile.in
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/Validate.cc
src/SynTree/Initializer.h
src/SynTree/ObjectDecl.cc
src/SynTree/Visitor.h
src/main.cc

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 : Wed Jan 20 12:59:17 2016
-// Update Count     : 254
+// Last Modified On : Tue Feb 09 13:24:40 2016
+// Update Count     : 255
 //
 
@@ -26 +26 @@
 #include "SynTree/Statement.h"
 
-#include "utility.h"
-#include "UnimplementedError.h"
+#include "Common/utility.h"
+#include "Common/UnimplementedError.h"
 
 #include "CodeGenerator.h"
@@ -458 +458 @@
         }
 
-        void CodeGenerator::visit( AlignofExpr *sizeofExpr ) {
+        void CodeGenerator::visit( AlignofExpr *alignofExpr ) {
                 // use GCC extension to avoid bumping std to C11
                 output << "__alignof__(";
-                if ( sizeofExpr->get_isType() ) {
-                        output << genType( sizeofExpr->get_type(), "" );
-                } else {
-                        sizeofExpr->get_expr()->accept( *this );
-                } // if
+                if ( alignofExpr->get_isType() ) {
+                        output << genType( alignofExpr->get_type(), "" );
+                } else {
+                        alignofExpr->get_expr()->accept( *this );
+                } // if
+                output << ")";
+        }
+
+        void CodeGenerator::visit( UntypedOffsetofExpr *offsetofExpr ) {
+                assert( false );
+        }
+
+        void CodeGenerator::visit( OffsetofExpr *offsetofExpr ) {
+                // use GCC builtin
+                output << "__builtin_offsetof(";
+                output << genType( offsetofExpr->get_type(), "" );
+                output << ", " << mangleName( offsetofExpr->get_member() );
                 output << ")";
         }

src/CodeGen/CodeGenerator.h

@@ -61 +61 @@
                 virtual void visit( SizeofExpr *sizeofExpr );
                 virtual void visit( AlignofExpr *alignofExpr );
+                virtual void visit( UntypedOffsetofExpr *offsetofExpr );
+                virtual void visit( OffsetofExpr *offsetofExpr );
                 virtual void visit( LogicalExpr *logicalExpr );
                 virtual void visit( ConditionalExpr *conditionalExpr );