Changeset 72dc82a for src

Timestamp:

Mar 31, 2017, 12:21:52 PM (8 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:

78d3dd5

Parents:

690f13c (diff), 936a287 (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

Files:

• CodeGen/CodeGenerator.cc (modified) (2 diffs)
• InitTweak/FixInit.cc (modified) (2 diffs)
• InitTweak/GenInit.cc (modified) (1 diff)
• Parser/ExpressionNode.cc (modified) (2 diffs)
• Parser/parser.yy (modified) (2 diffs)
• SymTab/Indexer.cc (modified) (2 diffs)
• SymTab/Validate.cc (modified) (3 diffs)
• SynTree/Expression.cc (modified) (3 diffs)
• SynTree/Expression.h (modified) (4 diffs)
• SynTree/Mutator.cc (modified) (2 diffs)
• SynTree/Visitor.cc (modified) (2 diffs)
• libcfa/iostream.c (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 09:06:01 2017
-// Update Count     : 481
+// Last Modified On : Thu Mar 30 16:38:01 2017
+// Update Count     : 482
 //
 
@@ -674 +674 @@
 
         void CodeGenerator::visit( CompoundLiteralExpr *compLitExpr ) {
-                assert( compLitExpr->get_type() && dynamic_cast< ListInit * > ( compLitExpr->get_initializer() ) );
-                output << "(" << genType( compLitExpr->get_type(), "", pretty ) << ")";
+                assert( compLitExpr->get_result() && dynamic_cast< ListInit * > ( compLitExpr->get_initializer() ) );
+                output << "(" << genType( compLitExpr->get_result(), "", pretty ) << ")";
                 compLitExpr->get_initializer()->accept( *this );
         }

src/InitTweak/FixInit.cc

@@ -738 +738 @@
                                                 stmtsToAddAfter.push_back( ifStmt );
 
-                                                if ( ctorInit->get_dtor() ) {
+                                                Statement * dtor = ctorInit->get_dtor();
+                                                objDecl->set_init( NULL );
+                                                ctorInit->set_ctor( NULL );
+                                                ctorInit->set_dtor( nullptr );
+                                                if ( dtor ) {
                                                         // if the object has a non-trivial destructor, have to
                                                         // hoist it and the object into the global space and
                                                         // call the destructor function with atexit.
 
-                                                        Statement * dtorStmt = ctorInit->get_dtor()->clone();
+                                                        Statement * dtorStmt = dtor->clone();
 
                                                         // void __objName_dtor_atexitN(...) {...}
@@ -772 +776 @@
                                                         objDecl->set_mangleName( SymTab::Mangler::mangle( objDecl ) );
 
-                                                        objDecl->set_init( NULL );
-                                                        ctorInit->set_ctor( NULL );
-                                                        delete ctorInit;
-
                                                         // xxx - temporary hack: need to return a declaration, but want to hoist the current object out of this scope
                                                         // create a new object which is never used
                                                         static UniqueName dummyNamer( "_dummy" );
                                                         ObjectDecl * dummy = new ObjectDecl( dummyNamer.newName(), Type::StorageClasses( Type::Static ), LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), 0, std::list< Attribute * >{ new Attribute("unused") } );
+                                                        delete ctorInit;
                                                         return dummy;
                                                 }

src/InitTweak/GenInit.cc

@@ -294 +294 @@
                 handleDWT( objDecl );
                 // hands off if @=, extern, builtin, etc.
-                // if global but initializer is not constexpr, always try to construct, since this is not legal C
-                if ( ( tryConstruct( objDecl ) && isManaged( objDecl ) ) || (! inFunction && ! isConstExpr( objDecl->get_init() ) ) ) {
+                // even if unmanaged, try to construct global or static if initializer is not constexpr, since this is not legal C
+                if ( tryConstruct( objDecl ) && ( isManaged( objDecl ) || ((! inFunction || objDecl->get_storageClasses().is_static ) && ! isConstExpr( objDecl->get_init() ) ) ) ) {
                         // constructed objects cannot be designated
-                        if ( isDesignated( objDecl->get_init() ) ) throw SemanticError( "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.", objDecl );
+                        if ( isDesignated( objDecl->get_init() ) ) throw SemanticError( "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.\n", objDecl );
                         // constructed objects should not have initializers nested too deeply
                         if ( ! checkInitDepth( objDecl ) ) throw SemanticError( "Managed object's initializer is too deep ", objDecl );

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Mar  4 06:58:47 2017
-// Update Count     : 509
+// Last Modified On : Thu Mar 30 17:02:46 2017
+// Update Count     : 515
 //
 
@@ -356 +356 @@
         // these types do not have associated type information
         } else if ( StructDecl * newDeclStructDecl = dynamic_cast< StructDecl * >( newDecl )  ) {
-                return new CompoundLiteralExpr( new StructInstType( Type::Qualifiers(), newDeclStructDecl->get_name() ), maybeMoveBuild< Initializer >(kids) );
+                if ( newDeclStructDecl->has_body() ) {
+                        return new CompoundLiteralExpr( new StructInstType( Type::Qualifiers(), newDeclStructDecl ), maybeMoveBuild< Initializer >(kids) );
+                } else {
+                        return new CompoundLiteralExpr( new StructInstType( Type::Qualifiers(), newDeclStructDecl->get_name() ), maybeMoveBuild< Initializer >(kids) );
+                } // if
         } else if ( UnionDecl * newDeclUnionDecl = dynamic_cast< UnionDecl * >( newDecl )  ) {
-                return new CompoundLiteralExpr( new UnionInstType( Type::Qualifiers(), newDeclUnionDecl->get_name() ), maybeMoveBuild< Initializer >(kids) );
+                if ( newDeclUnionDecl->has_body() ) {
+                        return new CompoundLiteralExpr( new UnionInstType( Type::Qualifiers(), newDeclUnionDecl ), maybeMoveBuild< Initializer >(kids) );
+                } else {
+                        return new CompoundLiteralExpr( new UnionInstType( Type::Qualifiers(), newDeclUnionDecl->get_name() ), maybeMoveBuild< Initializer >(kids) );
+                } // if
         } else if ( EnumDecl * newDeclEnumDecl = dynamic_cast< EnumDecl * >( newDecl )  ) {
-                return new CompoundLiteralExpr( new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() ), maybeMoveBuild< Initializer >(kids) );
+                if ( newDeclEnumDecl->has_body() ) {
+                        return new CompoundLiteralExpr( new EnumInstType( Type::Qualifiers(), newDeclEnumDecl ), maybeMoveBuild< Initializer >(kids) );
+                } else {
+                        return new CompoundLiteralExpr( new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() ), maybeMoveBuild< Initializer >(kids) );
+                } // if
         } else {
                 assert( false );

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 15:42:22 2017
-// Update Count     : 2317
+// Last Modified On : Thu Mar 30 15:42:32 2017
+// Update Count     : 2318
 //
 
@@ -423 +423 @@
         | postfix_expression DECR
                 { $$ = new ExpressionNode( build_unary_ptr( OperKinds::DecrPost, $1 ) ); }
-        | '(' type_name_no_function ')' '{' initializer_list comma_opt '}' // C99
+        | '(' type_name_no_function ')' '{' initializer_list comma_opt '}' // C99, compound-literal
                 { $$ = new ExpressionNode( build_compoundLiteral( $2, new InitializerNode( $5, true ) ) ); }
         | postfix_expression '{' argument_expression_list '}' // CFA

src/SymTab/Indexer.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:37:33 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 08:07:34 2017
-// Update Count     : 17
+// Last Modified On : Thu Mar 30 16:38:47 2017
+// Update Count     : 19
 //
 
@@ -483 +483 @@
         void Indexer::visit( CompoundLiteralExpr *compLitExpr ) {
                 acceptNewScope( compLitExpr->get_result(), *this );
-                maybeAccept( compLitExpr->get_type(), *this );
                 maybeAccept( compLitExpr->get_initializer(), *this );
         }

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 16:39:15 2017
-// Update Count     : 353
+// Last Modified On : Thu Mar 30 16:50:13 2017
+// Update Count     : 357
 //
 
@@ -222 +222 @@
                 CompoundLiteral compoundliteral;
 
+                HoistStruct::hoistStruct( translationUnit );
                 EliminateTypedef::eliminateTypedef( translationUnit );
-                HoistStruct::hoistStruct( translationUnit );
                 ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
                 acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
@@ -824 +824 @@
                 static UniqueName indexName( "_compLit" );
 
-                ObjectDecl *tempvar = new ObjectDecl( indexName.newName(), storageClasses, LinkageSpec::C, 0, compLitExpr->get_type(), compLitExpr->get_initializer() );
-                compLitExpr->set_type( 0 );
+                ObjectDecl *tempvar = new ObjectDecl( indexName.newName(), storageClasses, LinkageSpec::C, 0, compLitExpr->get_result(), compLitExpr->get_initializer() );
+                compLitExpr->set_result( 0 );
                 compLitExpr->set_initializer( 0 );
                 delete compLitExpr;

src/SynTree/Expression.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 09:42:04 2017
-// Update Count     : 51
+// Last Modified On : Thu Mar 30 16:41:13 2017
+// Update Count     : 52
 //
 
@@ -571 +571 @@
 
 
-CompoundLiteralExpr::CompoundLiteralExpr( Type * type, Initializer * initializer ) : type( type ), initializer( initializer ) {
+CompoundLiteralExpr::CompoundLiteralExpr( Type * type, Initializer * initializer ) : initializer( initializer ) {
         assert( type && initializer );
-        set_result( type->clone() );
-}
-
-CompoundLiteralExpr::CompoundLiteralExpr( const CompoundLiteralExpr &other ) : Expression( other ), type( other.type->clone() ), initializer( other.initializer->clone() ) {}
+        set_result( type );
+}
+
+CompoundLiteralExpr::CompoundLiteralExpr( const CompoundLiteralExpr &other ) : Expression( other ), initializer( other.initializer->clone() ) {}
 
 CompoundLiteralExpr::~CompoundLiteralExpr() {
         delete initializer;
-        delete type;
 }
 
@@ -586 +585 @@
         os << "Compound Literal Expression: " << std::endl;
         os << std::string( indent+2, ' ' );
-        type->print( os, indent + 2 );
+        get_result()->print( os, indent + 2 );
         os << std::string( indent+2, ' ' );
         initializer->print( os, indent + 2 );

src/SynTree/Expression.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jan 14 14:37:54 2017
-// Update Count     : 37
+// Last Modified On : Thu Mar 30 16:44:00 2017
+// Update Count     : 41
 //
 
@@ -35 +35 @@
 
         Type *& get_result() { return result; }
+        const Type * get_result() const { return result; }
         void set_result( Type * newValue ) { result = newValue; }
         bool has_result() const { return result != nullptr; }
@@ -586 +587 @@
         virtual ~CompoundLiteralExpr();
 
-        Type * get_type() const { return type; }
-        void set_type( Type * t ) { type = t; }
-
         Initializer * get_initializer() const { return initializer; }
         void set_initializer( Initializer * i ) { initializer = i; }
@@ -597 +595 @@
         virtual void print( std::ostream & os, int indent = 0 ) const;
   private:
-        Type * type;
         Initializer * initializer;
 };

src/SynTree/Mutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 16 15:02:23 2017
-// Update Count     : 21
+// Last Modified On : Thu Mar 30 16:45:19 2017
+// Update Count     : 22
 //
 
@@ -369 +369 @@
         compLitExpr->set_env( maybeMutate( compLitExpr->get_env(), *this ) );
         compLitExpr->set_result( maybeMutate( compLitExpr->get_result(), *this ) );
-        compLitExpr->set_type( maybeMutate( compLitExpr->get_type(), *this ) );
         compLitExpr->set_initializer( maybeMutate( compLitExpr->get_initializer(), *this ) );
         return compLitExpr;

src/SynTree/Visitor.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 16 15:01:25 2017
-// Update Count     : 23
+// Last Modified On : Thu Mar 30 16:45:25 2017
+// Update Count     : 24
 //
 
@@ -292 +292 @@
 void Visitor::visit( CompoundLiteralExpr *compLitExpr ) {
         maybeAccept( compLitExpr->get_result(), *this );
-        maybeAccept( compLitExpr->get_type(), *this );
         maybeAccept( compLitExpr->get_initializer(), *this );
 }

src/libcfa/iostream.c

@@ -154 +154 @@
 ostype * ?|?( ostype * os, const char * cp ) {
         enum { Open = 1, Close, OpenClose };
-        static const unsigned char mask[256] = {
+        static const unsigned char mask[256] @= {
                 // opening delimiters, no space after
                 ['('] : Open, ['['] : Open, ['{'] : Open,