Changeset 1f44196 for src/CodeGen

Timestamp:

Nov 29, 2016, 3:30:59 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, stuck-waitfor-destruct, with_gc

Children:

8e5724e

Parents:

3a2128f (diff), 9129a84 (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 plg2:software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc

Location:

src/CodeGen

Files:

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

src/CodeGen/CodeGenerator.cc

@@ -307 +307 @@
                                                 } else {
                                                         // no address-of operator, so must be a pointer - add dereference
+                                                        // NOTE: if the assertion starts to trigger, check that the application expr isn't being shared.
+                                                        // Since its arguments are modified here, this assertion most commonly triggers when the application
+                                                        // is visited multiple times.
                                                         UntypedExpr * newExpr = new UntypedExpr( new NameExpr( "*?" ) );
                                                         newExpr->get_args().push_back( *arg );
-                                                        assert( (*arg)->get_results().size() == 1 );
-                                                        Type * type = InitTweak::getPointerBase( (*arg)->get_results().front() );
-                                                        assert( type );
-                                                        newExpr->get_results().push_back( type->clone() );
+                                                        Type * type = InitTweak::getPointerBase( (*arg)->get_result() );
+                                                        assertf( type, "First argument to a derefence must be a pointer. Ensure that expressions are not being shared." );
+                                                        newExpr->set_result( type->clone() );
                                                         *arg = newExpr;
                                                 } // if
@@ -527 +529 @@
                 extension( castExpr );
                 output << "(";
-                if ( castExpr->get_results().empty() ) {
+                if ( castExpr->get_result()->isVoid() ) {
                         output << "(void)" ;
-                } else if ( ! castExpr->get_results().front()->get_isLvalue() ) {
+                } else if ( ! castExpr->get_result()->get_isLvalue() ) {
                         // at least one result type of cast, but not an lvalue
                         output << "(";
-                        output << genType( castExpr->get_results().front(), "" );
+                        output << genType( castExpr->get_result(), "" );
                         output << ")";
                 } else {
@@ -640 +642 @@
         }
 
-        void CodeGenerator::visit( TupleExpr * tupleExpr ) {}
+        void CodeGenerator::visit( TupleExpr * tupleExpr ) { assert( false ); }
 
         void CodeGenerator::visit( TypeExpr * typeExpr ) {}
@@ -654 +656 @@
                 asmExpr->get_operand()->accept( *this );
                 output << " )";
+        }
+
+        void CodeGenerator::visit( CompoundLiteralExpr *compLitExpr ) {
+                assert( compLitExpr->get_type() && dynamic_cast< ListInit * > ( compLitExpr->get_initializer() ) );
+                output << "(" << genType( compLitExpr->get_type(), "" ) << ")";
+                compLitExpr->get_initializer()->accept( *this );
+        }
+
+        void CodeGenerator::visit( StmtExpr * stmtExpr ) {
+                std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
+                output << "({" << std::endl;
+                cur_indent += CodeGenerator::tabsize;
+                unsigned int numStmts = stmts.size();
+                unsigned int i = 0;
+                for ( Statement * stmt : stmts ) {
+                        output << indent << printLabels( stmt->get_labels() );
+                        if ( i+1 == numStmts ) {
+                                // last statement in a statement expression needs to be handled specially -
+                                // cannot cast to void, otherwise the expression statement has no value
+                                if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( stmt ) ) {
+                                        exprStmt->get_expr()->accept( *this );
+                                        output << ";" << endl;
+                                        ++i;
+                                        break;
+                                }
+                        }
+                        stmt->accept( *this );
+                        output << endl;
+                        if ( wantSpacing( stmt ) ) {
+                                output << endl;
+                        } // if
+                        ++i;
+                }
+                cur_indent -= CodeGenerator::tabsize;
+                output << indent << "})";
         }
 

src/CodeGen/CodeGenerator.h

@@ -70 +70 @@
                 virtual void visit( ConditionalExpr *conditionalExpr );
                 virtual void visit( CommaExpr *commaExpr );
+                virtual void visit( CompoundLiteralExpr *compLitExpr );
                 virtual void visit( TupleExpr *tupleExpr );
                 virtual void visit( TypeExpr *typeExpr );
                 virtual void visit( AsmExpr * );
+                virtual void visit( StmtExpr * );
 
                 //*** Statements

src/CodeGen/GenType.cc

@@ -227 +227 @@
                         typeString = "_Atomic " + typeString;
                 } // if
-                if ( type->get_isAttribute() ) {
-                        typeString = "__attribute(( )) " + typeString;
-                } // if
         }
 } // namespace CodeGen