Changeset 7ff30d07 for src/CodeGen

Timestamp:

Jun 14, 2016, 1:23:18 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

545ef59, c738ca4, ee51534

Parents:

6cbc25a (diff), c8c03683 (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

Conflicts:

Makefile.in
aclocal.m4
configure
src/Makefile.in
src/Tests/Context.c
src/driver/Makefile.in
src/examples/Makefile.in
src/examples/ctxts.c
src/examples/esskaykay.c
src/libcfa/Makefile.in

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (15 diffs)
• CodeGenerator.h (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 06 16:01:00 2016
-// Update Count     : 255
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jun  9 13:21:00 2016
+// Update Count     : 256
 //
 
@@ -251 +251 @@
         //*** Expressions
         void CodeGenerator::visit( ApplicationExpr *applicationExpr ) {
+                extension( applicationExpr );
                 if ( VariableExpr *varExpr = dynamic_cast< VariableExpr* >( applicationExpr->get_function() ) ) {
                         OperatorInfo opInfo;
@@ -366 +367 @@
 
         void CodeGenerator::visit( UntypedExpr *untypedExpr ) {
+                extension( untypedExpr );
                 if ( NameExpr *nameExpr = dynamic_cast< NameExpr* >( untypedExpr->get_function() ) ) {
                         OperatorInfo opInfo;
@@ -450 +452 @@
 
         void CodeGenerator::visit( NameExpr *nameExpr ) {
+                extension( nameExpr );
                 OperatorInfo opInfo;
                 if ( operatorLookup( nameExpr->get_name(), opInfo ) ) {
@@ -460 +463 @@
 
         void CodeGenerator::visit( AddressExpr *addressExpr ) {
+                extension( addressExpr );
                 output << "(&";
                 // this hack makes sure that we don't convert "constant_zero" to "0" if we're taking its address
@@ -471 +475 @@
 
         void CodeGenerator::visit( CastExpr *castExpr ) {
+                extension( castExpr );
                 output << "(";
                 if ( castExpr->get_results().empty() ) {
@@ -493 +498 @@
 
         void CodeGenerator::visit( MemberExpr *memberExpr ) {
+                extension( memberExpr );
                 memberExpr->get_aggregate()->accept( *this );
                 output << "." << mangleName( memberExpr->get_member() );
@@ -498 +504 @@
 
         void CodeGenerator::visit( VariableExpr *variableExpr ) {
+                extension( variableExpr );
                 OperatorInfo opInfo;
                 if ( variableExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic && operatorLookup( variableExpr->get_var()->get_name(), opInfo ) && opInfo.type == OT_CONSTANT ) {
@@ -508 +515 @@
         void CodeGenerator::visit( ConstantExpr *constantExpr ) {
                 assert( constantExpr->get_constant() );
+                extension( constantExpr );
                 constantExpr->get_constant()->accept( *this );
         }
 
         void CodeGenerator::visit( SizeofExpr *sizeofExpr ) {
+                extension( sizeofExpr );
                 output << "sizeof(";
                 if ( sizeofExpr->get_isType() ) {
@@ -522 +531 @@
 
         void CodeGenerator::visit( AlignofExpr *alignofExpr ) {
+                extension( alignofExpr );
                 // use GCC extension to avoid bumping std to C11
                 output << "__alignof__(";
@@ -537 +547 @@
 
         void CodeGenerator::visit( OffsetofExpr *offsetofExpr ) {
+                extension( offsetofExpr );
                 // use GCC builtin
                 output << "__builtin_offsetof(";
@@ -549 +560 @@
 
         void CodeGenerator::visit( LogicalExpr *logicalExpr ) {
+                extension( logicalExpr );
                 output << "(";
                 logicalExpr->get_arg1()->accept( *this );
@@ -561 +573 @@
 
         void CodeGenerator::visit( ConditionalExpr *conditionalExpr ) {
+                extension( conditionalExpr );
                 output << "(";
                 conditionalExpr->get_arg1()->accept( *this );
@@ -571 +584 @@
 
         void CodeGenerator::visit( CommaExpr *commaExpr ) {
+                extension( commaExpr );
                 output << "(";
                 commaExpr->get_arg1()->accept( *this );
@@ -583 +597 @@
 
         void CodeGenerator::visit( AsmExpr *asmExpr ) {
+                extension( asmExpr );
                 if ( asmExpr->get_inout() ) {
                         output << "[ ";

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:32:24 2016
-// Update Count     : 28
+// Last Modified On : Thu Jun  9 13:15:58 2016
+// Update Count     : 29
 //
 
@@ -96 +96 @@
                         std::ostream& operator()(std::ostream & os);
                 };
+
+                void extension( Expression *expr ) {
+                        if ( expr->get_extension() ) {
+                                output << "__extension__ ";
+                        } // if
+                } // extension
           private: