Index: src/Common/SemanticError.h =================================================================== --- src/Common/SemanticError.h (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/Common/SemanticError.h (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed May 16 15:01:23 2018 -// Update Count : 30 +// Last Modified On : Thu Jul 19 10:09:17 2018 +// Update Count : 31 // @@ -57,4 +57,5 @@ {"qualifiers-zero_t-one_t", "questionable use of type qualifier %s with %s", Severity::Warn}, {"aggregate-forward-decl" , "forward declaration of nested aggregate: %s" , Severity::Warn}, + {"superfluous-decl" , "declaration does not allocate storage: %s" , Severity::Warn}, }; @@ -64,5 +65,6 @@ BadQualifiersZeroOne, AggrForwardDecl, - NUMBER_OF_WARNINGS, //This MUST be the last warning + SuperfluousDecl, + NUMBER_OF_WARNINGS, // This MUST be the last warning }; Index: src/Parser/DeclarationNode.cc =================================================================== --- src/Parser/DeclarationNode.cc (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/Parser/DeclarationNode.cc (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -10,6 +10,6 @@ // Created On : Sat May 16 12:34:05 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Jul 6 06:56:08 2018 -// Update Count : 1088 +// Last Modified On : Fri Jul 20 14:56:54 2018 +// Update Count : 1107 // @@ -54,13 +54,5 @@ DeclarationNode::DeclarationNode() : - builtin( NoBuiltinType ), - type( nullptr ), - bitfieldWidth( nullptr ), - hasEllipsis( false ), - linkage( ::linkage ), - asmName( nullptr ), - initializer( nullptr ), - extension( false ), - asmStmt( nullptr ) { + linkage( ::linkage ) { // variable.name = nullptr; @@ -104,4 +96,5 @@ newnode->builtin = NoBuiltinType; newnode->type = maybeClone( type ); + newnode->inLine = inLine; newnode->storageClasses = storageClasses; newnode->funcSpecs = funcSpecs; @@ -131,5 +124,5 @@ } // DeclarationNode::clone -void DeclarationNode::print( std::ostream &os, int indent ) const { +void DeclarationNode::print( std::ostream & os, int indent ) const { os << string( indent, ' ' ); if ( name ) { @@ -167,5 +160,5 @@ } -void DeclarationNode::printList( std::ostream &os, int indent ) const { +void DeclarationNode::printList( std::ostream & os, int indent ) const { ParseNode::printList( os, indent ); if ( hasEllipsis ) { @@ -521,5 +514,5 @@ } // DeclarationNode::copySpecifiers -static void addQualifiersToType( TypeData *&src, TypeData * dst ) { +static void addQualifiersToType( TypeData *& src, TypeData * dst ) { if ( dst->base ) { addQualifiersToType( src, dst->base ); @@ -574,5 +567,5 @@ } // addQualifiers -static void addTypeToType( TypeData *&src, TypeData *&dst ) { +static void addTypeToType( TypeData *& src, TypeData *& dst ) { if ( src->forall && dst->kind == TypeData::Function ) { if ( dst->forall ) { @@ -965,5 +958,5 @@ } -void buildList( const DeclarationNode * firstNode, std::list< Declaration * > &outputList ) { +void buildList( const DeclarationNode * firstNode, std::list< Declaration * > & outputList ) { SemanticErrorException errors; std::back_insert_iterator< std::list< Declaration * > > out( outputList ); @@ -1002,38 +995,26 @@ // struct T; // anonymous member // }; - if ( ! (extracted && decl->name == "" && ! anon) ) { - if (decl->name == "") { + if ( ! (extracted && decl->name == "" && ! anon && ! cur->get_inLine()) ) { + if ( decl->name == "" ) { if ( DeclarationWithType * dwt = dynamic_cast( decl ) ) { if ( ReferenceToType * aggr = dynamic_cast( dwt->get_type() ) ) { if ( aggr->name.find("anonymous") == std::string::npos ) { - bool isInline = false; - if (cur->type->kind == TypeData::Aggregate || cur->type->kind == TypeData::AggregateInst) { - if (cur->type->kind == TypeData::Aggregate) { - isInline = cur->type->aggregate.inLine; - } else { - isInline = cur->type->aggInst.inLine; - if ( TypeData * aggr = cur->type->aggInst.aggregate ) { - if ( aggr->kind == TypeData::Aggregate ) { - isInline = isInline || aggr->aggregate.inLine; - } - } - } - } - if (! isInline) { - // temporary: warn about anonymous member declarations of named types, since this conflicts with the syntax for the forward declaration of an anonymous type + if ( ! cur->get_inLine() ) { + // temporary: warn about anonymous member declarations of named types, since + // this conflicts with the syntax for the forward declaration of an anonymous type SemanticWarning( cur->location, Warning::AggrForwardDecl, aggr->name.c_str() ); - } - } - } - } - } + } // if + } // if + } // if + } // if + } // if decl->location = cur->location; - * out++ = decl; - } + *out++ = decl; + } // if } // if - } catch( SemanticErrorException &e ) { + } catch( SemanticErrorException & e ) { errors.append( e ); } // try - } // while + } // for if ( ! errors.isEmpty() ) { @@ -1043,5 +1024,5 @@ // currently only builds assertions, function parameters, and return values -void buildList( const DeclarationNode * firstNode, std::list< DeclarationWithType * > &outputList ) { +void buildList( const DeclarationNode * firstNode, std::list< DeclarationWithType * > & outputList ) { SemanticErrorException errors; std::back_insert_iterator< std::list< DeclarationWithType * > > out( outputList ); @@ -1074,5 +1055,5 @@ * out++ = obj; } // if - } catch( SemanticErrorException &e ) { + } catch( SemanticErrorException & e ) { errors.append( e ); } // try @@ -1084,5 +1065,5 @@ } // buildList -void buildTypeList( const DeclarationNode * firstNode, std::list< Type * > &outputList ) { +void buildTypeList( const DeclarationNode * firstNode, std::list< Type * > & outputList ) { SemanticErrorException errors; std::back_insert_iterator< std::list< Type * > > out( outputList ); @@ -1092,5 +1073,5 @@ try { * out++ = cur->buildType(); - } catch( SemanticErrorException &e ) { + } catch( SemanticErrorException & e ) { errors.append( e ); } // try Index: src/Parser/ParseNode.h =================================================================== --- src/Parser/ParseNode.h (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/Parser/ParseNode.h (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:28:16 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Jun 6 16:17:18 2018 -// Update Count : 843 +// Last Modified On : Fri Jul 20 14:56:30 2018 +// Update Count : 850 // @@ -68,6 +68,6 @@ } - virtual void print( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const {} - virtual void printList( std::ostream &os, int indent = 0 ) const { + virtual void print( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const {} + virtual void printList( std::ostream & os, int indent = 0 ) const { print( os, indent ); if ( next ) next->print( os, indent ); @@ -103,5 +103,5 @@ InitializerNode * next_init() const { return kids; } - void print( std::ostream &os, int indent = 0 ) const; + void print( std::ostream & os, int indent = 0 ) const; void printOneLine( std::ostream & ) const; @@ -127,8 +127,8 @@ ExpressionNode * set_extension( bool exten ) { extension = exten; return this; } - virtual void print( std::ostream &os, __attribute__((unused)) int indent = 0 ) const override { - os << expr.get() << std::endl; - } - void printOneLine( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const {} + virtual void print( std::ostream & os, __attribute__((unused)) int indent = 0 ) const override { + os << expr.get(); + } + void printOneLine( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const {} template @@ -290,6 +290,6 @@ } - virtual void print( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const override; - virtual void printList( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const override; + virtual void print( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const override; + virtual void printList( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const override; Declaration * build() const; @@ -303,4 +303,7 @@ bool get_extension() const { return extension; } DeclarationNode * set_extension( bool exten ) { extension = exten; return this; } + + bool get_inLine() const { return inLine; } + DeclarationNode * set_inLine( bool inL ) { inLine = inL; return this; } public: DeclarationNode * get_last() { return (DeclarationNode *)ParseNode::get_last(); } @@ -327,21 +330,22 @@ StaticAssert_t assert; - BuiltinType builtin; - - TypeData * type; - + BuiltinType builtin = NoBuiltinType; + + TypeData * type = nullptr; + + bool inLine = false; Type::FuncSpecifiers funcSpecs; Type::StorageClasses storageClasses; - ExpressionNode * bitfieldWidth; + ExpressionNode * bitfieldWidth = nullptr; std::unique_ptr enumeratorValue; - bool hasEllipsis; + bool hasEllipsis = false; LinkageSpec::Spec linkage; - Expression * asmName; + Expression * asmName = nullptr; std::list< Attribute * > attributes; - InitializerNode * initializer; + InitializerNode * initializer = nullptr; bool extension = false; std::string error; - StatementNode * asmStmt; + StatementNode * asmStmt = nullptr; static UniqueName anonymous; @@ -377,5 +381,5 @@ virtual StatementNode * append_last_case( StatementNode * ); - virtual void print( std::ostream &os, __attribute__((unused)) int indent = 0 ) const override { + virtual void print( std::ostream & os, __attribute__((unused)) int indent = 0 ) const override { os << stmt.get() << std::endl; } @@ -435,5 +439,5 @@ template< typename SynTreeType, typename NodeType, template< typename, typename...> class Container, typename... Args > -void buildList( const NodeType * firstNode, Container< SynTreeType *, Args... > &outputList ) { +void buildList( const NodeType * firstNode, Container< SynTreeType *, Args... > & outputList ) { SemanticErrorException errors; std::back_insert_iterator< Container< SynTreeType *, Args... > > out( outputList ); @@ -449,5 +453,5 @@ assertf(false, "buildList unknown type"); } // if - } catch( SemanticErrorException &e ) { + } catch( SemanticErrorException & e ) { errors.append( e ); } // try @@ -460,10 +464,10 @@ // in DeclarationNode.cc -void buildList( const DeclarationNode * firstNode, std::list< Declaration * > &outputList ); -void buildList( const DeclarationNode * firstNode, std::list< DeclarationWithType * > &outputList ); -void buildTypeList( const DeclarationNode * firstNode, std::list< Type * > &outputList ); +void buildList( const DeclarationNode * firstNode, std::list< Declaration * > & outputList ); +void buildList( const DeclarationNode * firstNode, std::list< DeclarationWithType * > & outputList ); +void buildTypeList( const DeclarationNode * firstNode, std::list< Type * > & outputList ); template< typename SynTreeType, typename NodeType > -void buildMoveList( const NodeType * firstNode, std::list< SynTreeType * > &outputList ) { +void buildMoveList( const NodeType * firstNode, std::list< SynTreeType * > & outputList ) { buildList( firstNode, outputList ); delete firstNode; Index: src/Parser/TypeData.cc =================================================================== --- src/Parser/TypeData.cc (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/Parser/TypeData.cc (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -10,6 +10,6 @@ // Created On : Sat May 16 15:12:51 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Jul 12 13:52:09 2018 -// Update Count : 606 +// Last Modified On : Fri Jul 20 14:39:31 2018 +// Update Count : 622 // @@ -76,5 +76,4 @@ aggregate.parent = nullptr; aggregate.anon = false; - aggregate.inLine = false; break; case AggregateInst: @@ -83,5 +82,4 @@ aggInst.params = nullptr; aggInst.hoistType = false; - aggInst.inLine = false; break; case Symbolic: @@ -221,5 +219,4 @@ newtype->aggregate.body = aggregate.body; newtype->aggregate.anon = aggregate.anon; - newtype->aggregate.inLine = aggregate.inLine; newtype->aggregate.tagged = aggregate.tagged; newtype->aggregate.parent = aggregate.parent ? new string( *aggregate.parent ) : nullptr; @@ -229,5 +226,4 @@ newtype->aggInst.params = maybeClone( aggInst.params ); newtype->aggInst.hoistType = aggInst.hoistType; - newtype->aggInst.inLine = aggInst.inLine; break; case Enum: @@ -275,6 +271,15 @@ switch ( kind ) { - case Unknown: - os << "entity of unknown type "; + case Basic: + if ( signedness != DeclarationNode::NoSignedness ) os << DeclarationNode::signednessNames[ signedness ] << " "; + if ( length != DeclarationNode::NoLength ) os << DeclarationNode::lengthNames[ length ] << " "; + if ( complextype == DeclarationNode::NoComplexType ) { // basic type + assert( basictype != DeclarationNode::NoBasicType ); + os << DeclarationNode::basicTypeNames[ basictype ] << " "; + } else { // complex type + // handle double _Complex + if ( basictype != DeclarationNode::NoBasicType ) os << DeclarationNode::basicTypeNames[ basictype ] << " "; + os << DeclarationNode::complexTypeNames[ complextype ] << " "; + } // if break; case Pointer: @@ -285,13 +290,10 @@ } // if break; - case EnumConstant: - os << "enumeration constant "; - break; - case Basic: - if ( signedness != DeclarationNode::NoSignedness ) os << DeclarationNode::signednessNames[ signedness ] << " "; - if ( length != DeclarationNode::NoLength ) os << DeclarationNode::lengthNames[ length ] << " "; - assert( basictype != DeclarationNode::NoBasicType ); - os << DeclarationNode::basicTypeNames[ basictype ] << " "; - if ( complextype != DeclarationNode::NoComplexType ) os << DeclarationNode::complexTypeNames[ complextype ] << " "; + case Reference: + os << "reference "; + if ( base ) { + os << "to "; + base->print( os, indent ); + } // if break; case Array: @@ -379,10 +381,6 @@ } // if break; - case SymbolicInst: - os << "instance of type " << *symbolic.name; - if ( symbolic.actuals ) { - os << " with parameters" << endl; - symbolic.actuals->printList( os, indent + 2 ); - } // if + case EnumConstant: + os << "enumeration constant "; break; case Symbolic: @@ -406,4 +404,12 @@ } // if break; + case SymbolicInst: + os << *symbolic.name; + if ( symbolic.actuals ) { + os << "("; + symbolic.actuals->printList( os, indent + 2 ); + os << ")"; + } // if + break; case Tuple: os << "tuple "; @@ -421,4 +427,14 @@ case Builtin: os << DeclarationNode::builtinTypeNames[builtintype]; + break; + case GlobalScope: + break; + case Qualified: + qualified.parent->print( os ); + os << "."; + qualified.child->print( os ); + break; + case Unknown: + os << "entity of unknown type "; break; default: Index: src/Parser/TypeData.h =================================================================== --- src/Parser/TypeData.h (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/Parser/TypeData.h (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -10,6 +10,6 @@ // Created On : Sat May 16 15:18:36 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Jul 12 14:00:09 2018 -// Update Count : 193 +// Last Modified On : Fri Jul 20 13:56:40 2018 +// Update Count : 195 // @@ -26,5 +26,5 @@ struct TypeData { - enum Kind { Basic, Pointer, Array, Reference, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic, + enum Kind { Basic, Pointer, Reference, Array, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic, SymbolicInst, Tuple, Typeof, Builtin, GlobalScope, Qualified, Unknown }; @@ -37,5 +37,4 @@ bool body; bool anon; - bool inLine; bool tagged; @@ -47,5 +46,4 @@ ExpressionNode * params; bool hoistType; - bool inLine; }; @@ -79,5 +77,5 @@ }; - struct Qualified_t { // qualified type S.T + struct Qualified_t { // qualified type S.T TypeData * parent; TypeData * child; Index: src/Parser/parser.yy =================================================================== --- src/Parser/parser.yy (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/Parser/parser.yy (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -10,6 +10,6 @@ // Created On : Sat Sep 1 20:22:55 2001 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Jul 12 16:16:25 2018 -// Update Count : 3756 +// Last Modified On : Fri Jul 20 11:46:46 2018 +// Update Count : 3837 // @@ -114,4 +114,11 @@ } // for } // distExt + +void distInl( DeclarationNode * declaration ) { + // distribute EXTENSION across all declarations + for ( DeclarationNode *iter = declaration; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) { + iter->set_inLine( true ); + } // for +} // distInl void distQual( DeclarationNode * declaration, DeclarationNode * qualifiers ) { @@ -166,4 +173,17 @@ } // build_postfix_name +DeclarationNode * fieldDecl( DeclarationNode * typeSpec, DeclarationNode * fieldList ) { + if ( ! fieldList ) { // field declarator ? + if ( ! ( typeSpec->type && typeSpec->type->kind == TypeData::Aggregate ) ) { + stringstream ss; + typeSpec->type->print( ss ); + SemanticWarning( yylloc, Warning::SuperfluousDecl, ss.str().c_str() ); + return nullptr; + } // if + fieldList = DeclarationNode::newName( nullptr ); + } // if + return distAttr( typeSpec, fieldList ); // mark all fields in list +} // fieldDecl + bool forall = false, yyy = false; // aggregate have one or more forall qualifiers ? @@ -338,6 +358,6 @@ %type exception_declaration -%type field_declaration field_declaration_list_opt field_declarator_opt field_declaring_list -%type field field_list field_name fraction_constants_opt +%type field_declaration_list_opt field_declaration field_declaring_list_opt field_declarator field_abstract_list_opt field_abstract +%type field field_name_list field_name fraction_constants_opt %type external_function_definition function_definition function_array function_declarator function_no_ptr function_ptr @@ -352,5 +372,5 @@ %type cfa_array_parameter_1st_dimension -%type cfa_trait_declaring_list cfa_declaration cfa_field_declaring_list +%type cfa_trait_declaring_list cfa_declaration cfa_field_declaring_list cfa_field_abstract_list %type cfa_function_declaration cfa_function_return cfa_function_specifier @@ -492,13 +512,14 @@ ; -identifier: - IDENTIFIER - | ATTR_IDENTIFIER // CFA - | quasi_keyword - ; - no_attr_identifier: IDENTIFIER | quasi_keyword + | '@' // CFA + { Token tok = { new string( DeclarationNode::anonymous.newName() ), yylval.tok.loc }; $$ = tok; } + ; + +identifier: + no_attr_identifier + | ATTR_IDENTIFIER // CFA ; @@ -541,5 +562,5 @@ | type_name '.' no_attr_identifier // CFA, nested type { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; } - | type_name '.' '[' field_list ']' // CFA, nested type / tuple field selector + | type_name '.' '[' field_name_list ']' // CFA, nested type / tuple field selector { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; } | GENERIC '(' assignment_expression ',' generic_assoc_list ')' // C11 @@ -594,5 +615,5 @@ | postfix_expression FLOATING_FRACTIONconstant // CFA, tuple index { $$ = new ExpressionNode( build_fieldSel( $1, build_field_name_FLOATING_FRACTIONconstant( *$2 ) ) ); } - | postfix_expression '.' '[' field_list ']' // CFA, tuple field selector + | postfix_expression '.' '[' field_name_list ']' // CFA, tuple field selector { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $4 ) ) ); } | postfix_expression ARROW no_attr_identifier @@ -602,5 +623,5 @@ | postfix_expression ARROW INTEGERconstant // CFA, tuple index { $$ = new ExpressionNode( build_pfieldSel( $1, build_constantInteger( *$3 ) ) ); } - | postfix_expression ARROW '[' field_list ']' // CFA, tuple field selector + | postfix_expression ARROW '[' field_name_list ']' // CFA, tuple field selector { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $4 ) ) ); } | postfix_expression ICR @@ -629,12 +650,13 @@ // empty { $$ = nullptr; } - // | '@' // use default argument - // { $$ = new ExpressionNode( build_constantInteger( *new string( "2" ) ) ); } + | '?' // CFA, default parameter + { SemanticError( yylloc, "Default parameter for argument is currently unimplemented." ); $$ = nullptr; } + // { $$ = new ExpressionNode( build_constantInteger( *new string( "2" ) ) ); } | assignment_expression ; -field_list: // CFA, tuple field selector +field_name_list: // CFA, tuple field selector field - | field_list ',' field { $$ = (ExpressionNode *)$1->set_last( $3 ); } + | field_name_list ',' field { $$ = (ExpressionNode *)$1->set_last( $3 ); } ; @@ -643,13 +665,13 @@ | FLOATING_DECIMALconstant field { $$ = new ExpressionNode( build_fieldSel( new ExpressionNode( build_field_name_FLOATING_DECIMALconstant( *$1 ) ), maybeMoveBuild( $2 ) ) ); } - | FLOATING_DECIMALconstant '[' field_list ']' + | FLOATING_DECIMALconstant '[' field_name_list ']' { $$ = new ExpressionNode( build_fieldSel( new ExpressionNode( build_field_name_FLOATING_DECIMALconstant( *$1 ) ), build_tuple( $3 ) ) ); } | field_name '.' field { $$ = new ExpressionNode( build_fieldSel( $1, maybeMoveBuild( $3 ) ) ); } - | field_name '.' '[' field_list ']' + | field_name '.' '[' field_name_list ']' { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $4 ) ) ); } | field_name ARROW field { $$ = new ExpressionNode( build_pfieldSel( $1, maybeMoveBuild( $3 ) ) ); } - | field_name ARROW '[' field_list ']' + | field_name ARROW '[' field_name_list ']' { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $4 ) ) ); } ; @@ -1932,20 +1954,16 @@ field_declaration: - type_specifier field_declaring_list ';' - { $$ = distAttr( $1, $2 ); } - | EXTENSION type_specifier field_declaring_list ';' // GCC - { distExt( $3 ); $$ = distAttr( $2, $3 ); } // mark all fields in list - | INLINE type_specifier field_declaring_list ';' // CFA - { - if ( $2->type && ( $2->type->kind == TypeData::Aggregate || $2->type->kind == TypeData::AggregateInst ) ) { - if ( $2->type->kind == TypeData::Aggregate ) { - $2->type->aggregate.inLine = true; - } else { - $2->type->aggInst.inLine = true; - } // if - $$ = distAttr( $2, $3 ); - } else { - SemanticError( yylloc, "inline qualifier only allowed for aggregate field declarations." ); $$ = nullptr; - } // if + type_specifier field_declaring_list_opt ';' + { $$ = fieldDecl( $1, $2 ); } + | EXTENSION type_specifier field_declaring_list_opt ';' // GCC + { $$ = fieldDecl( $2, $3 ); distExt( $$ ); } + | INLINE type_specifier field_abstract_list_opt ';' // CFA + { + if ( ! $3 ) { // field declarator ? + $3 = DeclarationNode::newName( nullptr ); + } // if + $3->inLine = true; + $$ = distAttr( $2, $3 ); // mark all fields in list + distInl( $3 ); } | typedef_declaration ';' // CFA @@ -1953,38 +1971,55 @@ | EXTENSION cfa_field_declaring_list ';' // GCC { distExt( $2 ); $$ = $2; } // mark all fields in list + | INLINE cfa_field_abstract_list ';' // CFA, new style field declaration + { $$ = $2; } // mark all fields in list | cfa_typedef_declaration ';' // CFA | static_assert // C11 ; +field_declaring_list_opt: + // empty + { $$ = nullptr; } + | field_declarator + | field_declaring_list_opt ',' attribute_list_opt field_declarator + { $$ = $1->appendList( $4->addQualifiers( $3 ) ); } + ; + +field_declarator: + bit_subrange_size // C special case, no field name + { $$ = DeclarationNode::newBitfield( $1 ); } + | variable_declarator bit_subrange_size_opt + // A semantic check is required to ensure bit_subrange only appears on integral types. + { $$ = $1->addBitfield( $2 ); } + | variable_type_redeclarator bit_subrange_size_opt + // A semantic check is required to ensure bit_subrange only appears on integral types. + { $$ = $1->addBitfield( $2 ); } + ; + +field_abstract_list_opt: + // empty + { $$ = nullptr; } + | field_abstract + | field_abstract_list_opt ',' attribute_list_opt field_abstract + { $$ = $1->appendList( $4->addQualifiers( $3 ) ); } + ; + +field_abstract: + // no bit fields + variable_abstract_declarator + ; + cfa_field_declaring_list: // CFA, new style field declaration - cfa_abstract_declarator_tuple // CFA, no field name - | cfa_abstract_declarator_tuple no_attr_identifier_or_type_name + // bit-fields are handled by C declarations + cfa_abstract_declarator_tuple no_attr_identifier_or_type_name { $$ = $1->addName( $2 ); } | cfa_field_declaring_list ',' no_attr_identifier_or_type_name { $$ = $1->appendList( $1->cloneType( $3 ) ); } - | cfa_field_declaring_list ',' // CFA, no field name + ; + +cfa_field_abstract_list: // CFA, new style field declaration + // bit-fields are handled by C declarations + cfa_abstract_declarator_tuple + | cfa_field_abstract_list ',' { $$ = $1->appendList( $1->cloneType( 0 ) ); } - ; - -field_declaring_list: - field_declarator_opt - | field_declaring_list ',' attribute_list_opt field_declarator_opt - { $$ = $1->appendList( $4->addQualifiers( $3 ) ); } - ; - -field_declarator_opt: - // empty - { $$ = DeclarationNode::newName( 0 ); /* XXX */ } // CFA, no field name - // '@' - // { $$ = DeclarationNode::newName( new string( DeclarationNode::anonymous.newName() ) ); } // CFA, no field name - | bit_subrange_size // no field name - { $$ = DeclarationNode::newBitfield( $1 ); } - | variable_declarator bit_subrange_size_opt - // A semantic check is required to ensure bit_subrange only appears on base type int. - { $$ = $1->addBitfield( $2 ); } - | variable_type_redeclarator bit_subrange_size_opt - // A semantic check is required to ensure bit_subrange only appears on base type int. - { $$ = $1->addBitfield( $2 ); } - | variable_abstract_declarator // CFA, no field name ; @@ -2226,5 +2261,5 @@ | '[' push constant_expression ELLIPSIS constant_expression pop ']' // GCC, multiple array elements { $$ = new ExpressionNode( new RangeExpr( maybeMoveBuild< Expression >( $3 ), maybeMoveBuild< Expression >( $5 ) ) ); } - | '.' '[' push field_list pop ']' // CFA, tuple field selector + | '.' '[' push field_name_list pop ']' // CFA, tuple field selector { $$ = $4; } ; Index: src/SymTab/Validate.cc =================================================================== --- src/SymTab/Validate.cc (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/SymTab/Validate.cc (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -368,5 +368,7 @@ auto base = td->base; assert( base ); - return base->clone(); + Type * ret = base->clone(); + ret->get_qualifiers() = qualType->get_qualifiers(); + return ret; } else { // .T => T is not a type name @@ -388,4 +390,5 @@ if ( StructDecl * aggr = dynamic_cast< StructDecl * >( member ) ) { if ( aggr->name == inst->name ) { + // TODO: is this case, and other non-TypeInstType cases, necessary? return new StructInstType( qualType->get_qualifiers(), aggr ); } @@ -404,9 +407,11 @@ } } else if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( child ) ) { - // struct typedefs are being replaced by forward decls too early; move it to hoist struct + // name on the right is a typedef if ( NamedTypeDecl * aggr = dynamic_cast< NamedTypeDecl * > ( member ) ) { if ( aggr->name == inst->name ) { assert( aggr->base ); - return aggr->base->clone(); + Type * ret = aggr->base->clone(); + ret->get_qualifiers() = qualType->get_qualifiers(); + return ret; } } Index: src/driver/cc1.cc =================================================================== --- src/driver/cc1.cc (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/driver/cc1.cc (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -10,6 +10,6 @@ // Created On : Fri Aug 26 14:23:51 2005 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Jul 13 17:40:10 2018 -// Update Count : 110 +// Last Modified On : Thu Jul 19 10:46:11 2018 +// Update Count : 111 // @@ -454,7 +454,7 @@ args[nargs] = argv[i]; // pass the argument along nargs += 1; - #ifdef __DEBUG_H__ + #ifdef __DEBUG_H__ cerr << "arg:\"" << argv[i] << "\"" << endl; - #endif // __DEBUG_H__ + #endif // __DEBUG_H__ } // if } // if Index: src/libcfa/concurrency/kernel.c =================================================================== --- src/libcfa/concurrency/kernel.c (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/libcfa/concurrency/kernel.c (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -37,6 +37,6 @@ //Start and stop routine for the kernel, declared first to make sure they run first -void kernel_startup(void) __attribute__(( constructor( STARTUP_PRIORITY_KERNEL ) )); -void kernel_shutdown(void) __attribute__(( destructor ( STARTUP_PRIORITY_KERNEL ) )); +static void kernel_startup(void) __attribute__(( constructor( STARTUP_PRIORITY_KERNEL ) )); +static void kernel_shutdown(void) __attribute__(( destructor ( STARTUP_PRIORITY_KERNEL ) )); //----------------------------------------------------------------------------- @@ -133,9 +133,10 @@ // Construct the processor context of non-main processors -void ?{}(processorCtx_t & this, processor * proc, current_stack_info_t * info) { +static void ?{}(processorCtx_t & this, processor * proc, current_stack_info_t * info) { (this.__cor){ info }; this.proc = proc; } +static void start(processor * this); void ?{}(processor & this, const char * name, cluster & cltr) with( this ) { this.name = name; @@ -186,4 +187,8 @@ // Kernel Scheduling logic //============================================================================================= +static void runThread(processor * this, thread_desc * dst); +static void finishRunning(processor * this); +static void halt(processor * this); + //Main of the processor contexts void main(processorCtx_t & runner) { @@ -239,5 +244,5 @@ // runThread runs a thread by context switching // from the processor coroutine to the target thread -void runThread(processor * this, thread_desc * dst) { +static void runThread(processor * this, thread_desc * dst) { assert(dst->curr_cor); coroutine_desc * proc_cor = get_coroutine(this->runner); @@ -256,5 +261,5 @@ // KERNEL_ONLY -void returnToKernel() { +static void returnToKernel() { coroutine_desc * proc_cor = get_coroutine(kernelTLS.this_processor->runner); coroutine_desc * thrd_cor = kernelTLS.this_thread->curr_cor = kernelTLS.this_coroutine; @@ -265,5 +270,5 @@ // Once a thread has finished running, some of // its final actions must be executed from the kernel -void finishRunning(processor * this) with( this->finish ) { +static void finishRunning(processor * this) with( this->finish ) { verify( ! kernelTLS.preemption_state.enabled ); choose( action_code ) { @@ -299,5 +304,5 @@ // This is the entry point for processors (kernel threads) // It effectively constructs a coroutine by stealing the pthread stack -void * CtxInvokeProcessor(void * arg) { +static void * CtxInvokeProcessor(void * arg) { processor * proc = (processor *) arg; kernelTLS.this_processor = proc; @@ -336,5 +341,5 @@ } -void start(processor * this) { +static void start(processor * this) { __cfaabi_dbg_print_safe("Kernel : Starting core %p\n", this); @@ -542,5 +547,5 @@ //----------------------------------------------------------------------------- // Kernel boot procedures -void kernel_startup(void) { +static void kernel_startup(void) { verify( ! kernelTLS.preemption_state.enabled ); __cfaabi_dbg_print_safe("Kernel : Starting\n"); @@ -618,5 +623,5 @@ } -void kernel_shutdown(void) { +static void kernel_shutdown(void) { __cfaabi_dbg_print_safe("\n--------------------------------------------------\nKernel : Shutting down\n"); @@ -655,6 +660,5 @@ // Kernel Quiescing //============================================================================================= - -void halt(processor * this) with( *this ) { +static void halt(processor * this) with( *this ) { // verify( ! __atomic_load_n(&do_terminate, __ATOMIC_SEQ_CST) ); @@ -683,6 +687,4 @@ // Unexpected Terminating logic //============================================================================================= - - static __spinlock_t kernel_abort_lock; static bool kernel_abort_called = false; Index: src/libcfa/concurrency/kernel_private.h =================================================================== --- src/libcfa/concurrency/kernel_private.h (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/libcfa/concurrency/kernel_private.h (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -54,8 +54,4 @@ // Processor void main(processorCtx_t *); -void start(processor * this); -void runThread(processor * this, thread_desc * dst); -void finishRunning(processor * this); -void halt(processor * this); static inline void wake_fast(processor * this) { Index: src/libcfa/concurrency/preemption.c =================================================================== --- src/libcfa/concurrency/preemption.c (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/libcfa/concurrency/preemption.c (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -39,12 +39,12 @@ // FwdDeclarations : Signal handlers -void sigHandler_ctxSwitch( __CFA_SIGPARMS__ ); -void sigHandler_segv ( __CFA_SIGPARMS__ ); -void sigHandler_ill ( __CFA_SIGPARMS__ ); -void sigHandler_fpe ( __CFA_SIGPARMS__ ); -void sigHandler_abort ( __CFA_SIGPARMS__ ); +static void sigHandler_ctxSwitch( __CFA_SIGPARMS__ ); +static void sigHandler_segv ( __CFA_SIGPARMS__ ); +static void sigHandler_ill ( __CFA_SIGPARMS__ ); +static void sigHandler_fpe ( __CFA_SIGPARMS__ ); +static void sigHandler_abort ( __CFA_SIGPARMS__ ); // FwdDeclarations : alarm thread main -void * alarm_loop( __attribute__((unused)) void * args ); +static void * alarm_loop( __attribute__((unused)) void * args ); // Machine specific register name @@ -63,5 +63,5 @@ static pthread_t alarm_thread; // pthread handle to alarm thread -void ?{}(event_kernel_t & this) with( this ) { +static void ?{}(event_kernel_t & this) with( this ) { alarms{}; lock{}; @@ -85,5 +85,5 @@ // Tick one frame of the Discrete Event Simulation for alarms -void tick_preemption() { +static void tick_preemption() { alarm_node_t * node = NULL; // Used in the while loop but cannot be declared in the while condition alarm_list_t * alarms = &event_kernel->alarms; // Local copy for ease of reading @@ -350,5 +350,5 @@ // Context switch signal handler // Receives SIGUSR1 signal and causes the current thread to yield -void sigHandler_ctxSwitch( __CFA_SIGPARMS__ ) { +static void sigHandler_ctxSwitch( __CFA_SIGPARMS__ ) { __cfaabi_dbg_debug_do( last_interrupt = (void *)(cxt->uc_mcontext.CFA_REG_IP); ) @@ -393,5 +393,5 @@ // Main of the alarm thread // Waits on SIGALRM and send SIGUSR1 to whom ever needs it -void * alarm_loop( __attribute__((unused)) void * args ) { +static void * alarm_loop( __attribute__((unused)) void * args ) { // Block sigalrms to control when they arrive sigset_t mask; Index: src/libcfa/concurrency/preemption.h =================================================================== --- src/libcfa/concurrency/preemption.h (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/libcfa/concurrency/preemption.h (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -22,5 +22,4 @@ void kernel_stop_preemption(); void update_preemption( processor * this, Duration duration ); -void tick_preemption(); struct preemption_scope { Index: src/tests/.expect/attributes.x64.txt =================================================================== --- src/tests/.expect/attributes.x64.txt (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/tests/.expect/attributes.x64.txt (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -88,5 +88,4 @@ __attribute__ ((used,unused,unused)) signed int __f7__i_1; __attribute__ ((used,used,unused)) signed int __f8__i_1; - __attribute__ ((unused)) signed int __anonymous_object0; __attribute__ ((unused,unused)) signed int *__f9__Pi_1; }; @@ -103,6 +102,5 @@ static inline void ___constructor__F_4sFdliiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1); static inline void ___constructor__F_4sFdliiiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1); -static inline void ___constructor__F_4sFdliiiiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object1); -static inline void ___constructor__F_4sFdliiiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object2, __attribute__ ((unused,unused)) signed int *__f9__Pi_1); +static inline void ___constructor__F_4sFdliiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused,unused)) signed int *__f9__Pi_1); static inline void ___constructor__F_4sFdl_autogen___1(struct Fdl *___dst__4sFdl_1){ ((void)((*___dst__4sFdl_1).__f1__i_1) /* ?{} */); @@ -114,5 +112,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -126,10 +123,8 @@ ((void)((*___dst__4sFdl_1).__f7__i_1=___src__4sFdl_1.__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1=___src__4sFdl_1.__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0=___src__4sFdl_1.__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1=___src__4sFdl_1.__f9__Pi_1) /* ?{} */); } static inline void ___destructor__F_4sFdl_autogen___1(struct Fdl *___dst__4sFdl_1){ ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ^?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ^?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ^?{} */); ((void)((*___dst__4sFdl_1).__f7__i_1) /* ^?{} */); @@ -151,5 +146,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1=___src__4sFdl_1.__f7__i_1)); ((void)((*___dst__4sFdl_1).__f8__i_1=___src__4sFdl_1.__f8__i_1)); - ((void)((*___dst__4sFdl_1).__anonymous_object0=___src__4sFdl_1.__anonymous_object0)); ((void)((*___dst__4sFdl_1).__f9__Pi_1=___src__4sFdl_1.__f9__Pi_1)); ((void)___constructor__F_4sFdl4sFdl_autogen___1((&___ret__4sFdl_1), (*___dst__4sFdl_1))); @@ -165,5 +159,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -177,5 +170,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -189,5 +181,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -201,5 +192,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -213,5 +203,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -225,5 +214,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -237,5 +225,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -249,8 +236,7 @@ ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1=__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); -} -static inline void ___constructor__F_4sFdliiiiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object3){ + ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); +} +static inline void ___constructor__F_4sFdliiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused,unused)) signed int *__f9__Pi_1){ ((void)((*___dst__4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */); @@ -261,17 +247,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1=__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0=__anonymous_object3) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); -} -static inline void ___constructor__F_4sFdliiiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object4, __attribute__ ((unused,unused)) signed int *__f9__Pi_1){ - ((void)((*___dst__4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f3__i_1=__f3__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f4__i_1=__f4__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f5__i_1=__f5__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f6__i_1=__f6__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f8__i_1=__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0=__anonymous_object4) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1=__f9__Pi_1) /* ?{} */); } @@ -293,11 +266,11 @@ __attribute__ ((unused)) signed int **const ___retval_f2__CPPi_1; } -__attribute__ ((unused,used,unused)) signed int (*__f3__FPA0i_i__1(signed int __anonymous_object5))[]; +__attribute__ ((unused,used,unused)) signed int (*__f3__FPA0i_i__1(signed int __anonymous_object0))[]; __attribute__ ((unused,unused)) signed int (*__f3__FPA0i_i__1(signed int __p__i_1))[]{ __attribute__ ((unused)) signed int (*___retval_f3__PA0i_1)[]; } -__attribute__ ((unused,used,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object6); -__attribute__ ((unused,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object7){ - __attribute__ ((unused)) signed int (*___retval_f4__Fi_i__1)(signed int __anonymous_object8); +__attribute__ ((unused,used,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object1); +__attribute__ ((unused,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object2){ + __attribute__ ((unused)) signed int (*___retval_f4__Fi_i__1)(signed int __anonymous_object3); } signed int __vtr__Fi___1(){ @@ -329,8 +302,8 @@ signed int __tpr2__Fi_PPi__1(__attribute__ ((unused,unused,unused,unused,unused,unused)) signed int **__Foo__PPi_1); signed int __tpr3__Fi_Pi__1(__attribute__ ((unused,unused,unused)) signed int *__Foo__Pi_1); -signed int __tpr4__Fi_Fi_Pi___1(__attribute__ ((unused,unused)) signed int (*__anonymous_object9)(__attribute__ ((unused,unused)) signed int __anonymous_object10[((unsigned long int )5)])); +signed int __tpr4__Fi_Fi_Pi___1(__attribute__ ((unused,unused)) signed int (*__anonymous_object4)(__attribute__ ((unused,unused)) signed int __anonymous_object5[((unsigned long int )5)])); signed int __tpr5__Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__Foo__Fi___1)()); signed int __tpr6__Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__Foo__Fi___1)()); -signed int __tpr7__Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object11)(__attribute__ ((unused)) signed int (*__anonymous_object12)(__attribute__ ((unused,unused)) signed int __anonymous_object13))); +signed int __tpr7__Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object6)(__attribute__ ((unused)) signed int (*__anonymous_object7)(__attribute__ ((unused,unused)) signed int __anonymous_object8))); signed int __ad__Fi___1(){ __attribute__ ((unused)) signed int ___retval_ad__i_1; @@ -386,16 +359,15 @@ ((void)sizeof(enum __anonymous4 )); } -signed int __apd1__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object14, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object15); -signed int __apd2__Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object16, __attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object17); -signed int __apd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object18, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object19); -signed int __apd4__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object20)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object21)()); -signed int __apd5__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object22)(__attribute__ ((unused)) signed int __anonymous_object23), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object24)(__attribute__ ((unused)) signed int __anonymous_object25)); -signed int __apd6__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object26)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object27)()); -signed int __apd7__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object28)(__attribute__ ((unused)) signed int __anonymous_object29), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object30)(__attribute__ ((unused)) signed int __anonymous_object31)); +signed int __apd1__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object9, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object10); +signed int __apd2__Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object11, __attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object12); +signed int __apd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object13, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object14); +signed int __apd4__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object15)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object16)()); +signed int __apd5__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object17)(__attribute__ ((unused)) signed int __anonymous_object18), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object19)(__attribute__ ((unused)) signed int __anonymous_object20)); +signed int __apd6__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object21)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object22)()); +signed int __apd7__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object23)(__attribute__ ((unused)) signed int __anonymous_object24), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object25)(__attribute__ ((unused)) signed int __anonymous_object26)); struct Vad { - __attribute__ ((unused)) signed int __anonymous_object32; - __attribute__ ((unused,unused)) signed int *__anonymous_object33; - __attribute__ ((unused,unused)) signed int __anonymous_object34[((unsigned long int )10)]; - __attribute__ ((unused,unused)) signed int (*__anonymous_object35)(); + __attribute__ ((unused)) signed int __anonymous_object27:4; + __attribute__ ((unused)) signed int __anonymous_object28:4; + __attribute__ ((unused,unused)) signed int __anonymous_object29:6; }; static inline void ___constructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1); @@ -403,113 +375,13 @@ static inline void ___destructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1); static inline struct Vad ___operator_assign__F4sVad_4sVad4sVad_autogen___1(struct Vad *___dst__4sVad_1, struct Vad ___src__4sVad_1); -static inline void ___constructor__F_4sVadi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object36); -static inline void ___constructor__F_4sVadiPi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object37, __attribute__ ((unused,unused)) signed int *__anonymous_object38); -static inline void ___constructor__F_4sVadiPiA0i_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object39, __attribute__ ((unused,unused)) signed int *__anonymous_object40, __attribute__ ((unused,unused)) signed int __anonymous_object41[((unsigned long int )10)]); -static inline void ___constructor__F_4sVadiPiA0iFi___autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object42, __attribute__ ((unused,unused)) signed int *__anonymous_object43, __attribute__ ((unused,unused)) signed int __anonymous_object44[((unsigned long int )10)], __attribute__ ((unused,unused)) signed int (*__anonymous_object45)()); static inline void ___constructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1){ - ((void)((*___dst__4sVad_1).__anonymous_object32) /* ?{} */); - ((void)((*___dst__4sVad_1).__anonymous_object33) /* ?{} */); - { - signed int _index0 = 0; - for (;(_index0<10);((void)(++_index0))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index0)]) /* ?{} */); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */); } static inline void ___constructor__F_4sVad4sVad_autogen___1(struct Vad *___dst__4sVad_1, struct Vad ___src__4sVad_1){ - ((void)((*___dst__4sVad_1).__anonymous_object32=___src__4sVad_1.__anonymous_object32) /* ?{} */); - ((void)((*___dst__4sVad_1).__anonymous_object33=___src__4sVad_1.__anonymous_object33) /* ?{} */); - { - signed int _index1 = 0; - for (;(_index1<10);((void)(++_index1))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index1)]=___src__4sVad_1.__anonymous_object34[((signed long int )_index1)]) /* ?{} */); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object35=___src__4sVad_1.__anonymous_object35) /* ?{} */); } static inline void ___destructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1){ - ((void)((*___dst__4sVad_1).__anonymous_object35) /* ^?{} */); - { - signed int _index2 = (10-1); - for (;(_index2>=0);((void)(--_index2))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index2)]) /* ^?{} */); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object33) /* ^?{} */); - ((void)((*___dst__4sVad_1).__anonymous_object32) /* ^?{} */); } static inline struct Vad ___operator_assign__F4sVad_4sVad4sVad_autogen___1(struct Vad *___dst__4sVad_1, struct Vad ___src__4sVad_1){ struct Vad ___ret__4sVad_1; - ((void)((*___dst__4sVad_1).__anonymous_object32=___src__4sVad_1.__anonymous_object32)); - ((void)((*___dst__4sVad_1).__anonymous_object33=___src__4sVad_1.__anonymous_object33)); - { - signed int _index3 = 0; - for (;(_index3<10);((void)(++_index3))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index3)]=___src__4sVad_1.__anonymous_object34[((signed long int )_index3)])); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object35=___src__4sVad_1.__anonymous_object35)); ((void)___constructor__F_4sVad4sVad_autogen___1((&___ret__4sVad_1), (*___dst__4sVad_1))); return ___ret__4sVad_1; } -static inline void ___constructor__F_4sVadi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object46){ - ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object46) /* ?{} */); - ((void)((*___dst__4sVad_1).__anonymous_object33) /* ?{} */); - { - signed int _index4 = 0; - for (;(_index4<10);((void)(++_index4))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index4)]) /* ?{} */); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */); -} -static inline void ___constructor__F_4sVadiPi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object47, __attribute__ ((unused,unused)) signed int *__anonymous_object48){ - ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object47) /* ?{} */); - ((void)((*___dst__4sVad_1).__anonymous_object33=__anonymous_object48) /* ?{} */); - { - signed int _index5 = 0; - for (;(_index5<10);((void)(++_index5))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index5)]) /* ?{} */); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */); -} -static inline void ___constructor__F_4sVadiPiA0i_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object49, __attribute__ ((unused,unused)) signed int *__anonymous_object50, __attribute__ ((unused,unused)) signed int __anonymous_object51[((unsigned long int )10)]){ - ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object49) /* ?{} */); - ((void)((*___dst__4sVad_1).__anonymous_object33=__anonymous_object50) /* ?{} */); - { - signed int _index6 = 0; - for (;(_index6<10);((void)(++_index6))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index6)]=__anonymous_object51[((signed long int )_index6)]) /* ?{} */); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */); -} -static inline void ___constructor__F_4sVadiPiA0iFi___autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object52, __attribute__ ((unused,unused)) signed int *__anonymous_object53, __attribute__ ((unused,unused)) signed int __anonymous_object54[((unsigned long int )10)], __attribute__ ((unused,unused)) signed int (*__anonymous_object55)()){ - ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object52) /* ?{} */); - ((void)((*___dst__4sVad_1).__anonymous_object33=__anonymous_object53) /* ?{} */); - { - signed int _index7 = 0; - for (;(_index7<10);((void)(++_index7))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[((signed long int )_index7)]=__anonymous_object54[((signed long int )_index7)]) /* ?{} */); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object35=__anonymous_object55) /* ?{} */); -} Index: src/tests/.expect/attributes.x86.txt =================================================================== --- src/tests/.expect/attributes.x86.txt (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/tests/.expect/attributes.x86.txt (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -88,5 +88,4 @@ __attribute__ ((used,unused,unused)) signed int __f7__i_1; __attribute__ ((used,used,unused)) signed int __f8__i_1; - __attribute__ ((unused)) signed int __anonymous_object0; __attribute__ ((unused,unused)) signed int *__f9__Pi_1; }; @@ -103,6 +102,5 @@ static inline void ___constructor__F_4sFdliiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1); static inline void ___constructor__F_4sFdliiiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1); -static inline void ___constructor__F_4sFdliiiiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object1); -static inline void ___constructor__F_4sFdliiiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object2, __attribute__ ((unused,unused)) signed int *__f9__Pi_1); +static inline void ___constructor__F_4sFdliiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused,unused)) signed int *__f9__Pi_1); static inline void ___constructor__F_4sFdl_autogen___1(struct Fdl *___dst__4sFdl_1){ ((void)((*___dst__4sFdl_1).__f1__i_1) /* ?{} */); @@ -114,5 +112,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -126,10 +123,8 @@ ((void)((*___dst__4sFdl_1).__f7__i_1=___src__4sFdl_1.__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1=___src__4sFdl_1.__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0=___src__4sFdl_1.__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1=___src__4sFdl_1.__f9__Pi_1) /* ?{} */); } static inline void ___destructor__F_4sFdl_autogen___1(struct Fdl *___dst__4sFdl_1){ ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ^?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ^?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ^?{} */); ((void)((*___dst__4sFdl_1).__f7__i_1) /* ^?{} */); @@ -151,5 +146,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1=___src__4sFdl_1.__f7__i_1)); ((void)((*___dst__4sFdl_1).__f8__i_1=___src__4sFdl_1.__f8__i_1)); - ((void)((*___dst__4sFdl_1).__anonymous_object0=___src__4sFdl_1.__anonymous_object0)); ((void)((*___dst__4sFdl_1).__f9__Pi_1=___src__4sFdl_1.__f9__Pi_1)); ((void)___constructor__F_4sFdl4sFdl_autogen___1((&___ret__4sFdl_1), (*___dst__4sFdl_1))); @@ -165,5 +159,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -177,5 +170,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -189,5 +181,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -201,5 +192,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -213,5 +203,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -225,5 +214,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -237,5 +225,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); } @@ -249,8 +236,7 @@ ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1=__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); -} -static inline void ___constructor__F_4sFdliiiiiiiii_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object3){ + ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); +} +static inline void ___constructor__F_4sFdliiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused,unused)) signed int *__f9__Pi_1){ ((void)((*___dst__4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */); @@ -261,17 +247,4 @@ ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */); ((void)((*___dst__4sFdl_1).__f8__i_1=__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0=__anonymous_object3) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f9__Pi_1) /* ?{} */); -} -static inline void ___constructor__F_4sFdliiiiiiiiiPi_autogen___1(struct Fdl *___dst__4sFdl_1, __attribute__ ((unused)) signed int __f1__i_1, __attribute__ ((unused)) signed int __f2__i_1, __attribute__ ((unused,unused)) signed int __f3__i_1, __attribute__ ((unused)) signed int __f4__i_1, __attribute__ ((unused,unused)) signed int __f5__i_1, signed int __f6__i_1, __attribute__ ((unused,unused)) signed int __f7__i_1, __attribute__ ((unused)) signed int __f8__i_1, __attribute__ ((unused)) signed int __anonymous_object4, __attribute__ ((unused,unused)) signed int *__f9__Pi_1){ - ((void)((*___dst__4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f3__i_1=__f3__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f4__i_1=__f4__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f5__i_1=__f5__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f6__i_1=__f6__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f7__i_1=__f7__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__f8__i_1=__f8__i_1) /* ?{} */); - ((void)((*___dst__4sFdl_1).__anonymous_object0=__anonymous_object4) /* ?{} */); ((void)((*___dst__4sFdl_1).__f9__Pi_1=__f9__Pi_1) /* ?{} */); } @@ -293,11 +266,11 @@ __attribute__ ((unused)) signed int **const ___retval_f2__CPPi_1; } -__attribute__ ((unused,used,unused)) signed int (*__f3__FPA0i_i__1(signed int __anonymous_object5))[]; +__attribute__ ((unused,used,unused)) signed int (*__f3__FPA0i_i__1(signed int __anonymous_object0))[]; __attribute__ ((unused,unused)) signed int (*__f3__FPA0i_i__1(signed int __p__i_1))[]{ __attribute__ ((unused)) signed int (*___retval_f3__PA0i_1)[]; } -__attribute__ ((unused,used,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object6); -__attribute__ ((unused,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object7){ - __attribute__ ((unused)) signed int (*___retval_f4__Fi_i__1)(signed int __anonymous_object8); +__attribute__ ((unused,used,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object1); +__attribute__ ((unused,unused)) signed int (*__f4__FFi_i____1())(signed int __anonymous_object2){ + __attribute__ ((unused)) signed int (*___retval_f4__Fi_i__1)(signed int __anonymous_object3); } signed int __vtr__Fi___1(){ @@ -329,8 +302,8 @@ signed int __tpr2__Fi_PPi__1(__attribute__ ((unused,unused,unused,unused,unused,unused)) signed int **__Foo__PPi_1); signed int __tpr3__Fi_Pi__1(__attribute__ ((unused,unused,unused)) signed int *__Foo__Pi_1); -signed int __tpr4__Fi_Fi_Pi___1(__attribute__ ((unused,unused)) signed int (*__anonymous_object9)(__attribute__ ((unused,unused)) signed int __anonymous_object10[((unsigned int )5)])); +signed int __tpr4__Fi_Fi_Pi___1(__attribute__ ((unused,unused)) signed int (*__anonymous_object4)(__attribute__ ((unused,unused)) signed int __anonymous_object5[((unsigned int )5)])); signed int __tpr5__Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__Foo__Fi___1)()); signed int __tpr6__Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__Foo__Fi___1)()); -signed int __tpr7__Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object11)(__attribute__ ((unused)) signed int (*__anonymous_object12)(__attribute__ ((unused,unused)) signed int __anonymous_object13))); +signed int __tpr7__Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object6)(__attribute__ ((unused)) signed int (*__anonymous_object7)(__attribute__ ((unused,unused)) signed int __anonymous_object8))); signed int __ad__Fi___1(){ __attribute__ ((unused)) signed int ___retval_ad__i_1; @@ -386,16 +359,15 @@ ((void)sizeof(enum __anonymous4 )); } -signed int __apd1__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object14, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object15); -signed int __apd2__Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object16, __attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object17); -signed int __apd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object18, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object19); -signed int __apd4__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object20)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object21)()); -signed int __apd5__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object22)(__attribute__ ((unused)) signed int __anonymous_object23), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object24)(__attribute__ ((unused)) signed int __anonymous_object25)); -signed int __apd6__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object26)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object27)()); -signed int __apd7__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object28)(__attribute__ ((unused)) signed int __anonymous_object29), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object30)(__attribute__ ((unused)) signed int __anonymous_object31)); +signed int __apd1__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object9, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object10); +signed int __apd2__Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object11, __attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object12); +signed int __apd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object13, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object14); +signed int __apd4__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object15)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object16)()); +signed int __apd5__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object17)(__attribute__ ((unused)) signed int __anonymous_object18), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object19)(__attribute__ ((unused)) signed int __anonymous_object20)); +signed int __apd6__Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object21)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object22)()); +signed int __apd7__Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object23)(__attribute__ ((unused)) signed int __anonymous_object24), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object25)(__attribute__ ((unused)) signed int __anonymous_object26)); struct Vad { - __attribute__ ((unused)) signed int __anonymous_object32; - __attribute__ ((unused,unused)) signed int *__anonymous_object33; - __attribute__ ((unused,unused)) signed int __anonymous_object34[((unsigned int )10)]; - __attribute__ ((unused,unused)) signed int (*__anonymous_object35)(); + __attribute__ ((unused)) signed int __anonymous_object27:4; + __attribute__ ((unused)) signed int __anonymous_object28:4; + __attribute__ ((unused,unused)) signed int __anonymous_object29:6; }; static inline void ___constructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1); @@ -403,113 +375,13 @@ static inline void ___destructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1); static inline struct Vad ___operator_assign__F4sVad_4sVad4sVad_autogen___1(struct Vad *___dst__4sVad_1, struct Vad ___src__4sVad_1); -static inline void ___constructor__F_4sVadi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object36); -static inline void ___constructor__F_4sVadiPi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object37, __attribute__ ((unused,unused)) signed int *__anonymous_object38); -static inline void ___constructor__F_4sVadiPiA0i_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object39, __attribute__ ((unused,unused)) signed int *__anonymous_object40, __attribute__ ((unused,unused)) signed int __anonymous_object41[((unsigned int )10)]); -static inline void ___constructor__F_4sVadiPiA0iFi___autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object42, __attribute__ ((unused,unused)) signed int *__anonymous_object43, __attribute__ ((unused,unused)) signed int __anonymous_object44[((unsigned int )10)], __attribute__ ((unused,unused)) signed int (*__anonymous_object45)()); static inline void ___constructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1){ - ((void)((*___dst__4sVad_1).__anonymous_object32) /* ?{} */); - ((void)((*___dst__4sVad_1).__anonymous_object33) /* ?{} */); - { - signed int _index0 = 0; - for (;(_index0<10);((void)(++_index0))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[_index0]) /* ?{} */); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */); } static inline void ___constructor__F_4sVad4sVad_autogen___1(struct Vad *___dst__4sVad_1, struct Vad ___src__4sVad_1){ - ((void)((*___dst__4sVad_1).__anonymous_object32=___src__4sVad_1.__anonymous_object32) /* ?{} */); - ((void)((*___dst__4sVad_1).__anonymous_object33=___src__4sVad_1.__anonymous_object33) /* ?{} */); - { - signed int _index1 = 0; - for (;(_index1<10);((void)(++_index1))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[_index1]=___src__4sVad_1.__anonymous_object34[_index1]) /* ?{} */); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object35=___src__4sVad_1.__anonymous_object35) /* ?{} */); } static inline void ___destructor__F_4sVad_autogen___1(struct Vad *___dst__4sVad_1){ - ((void)((*___dst__4sVad_1).__anonymous_object35) /* ^?{} */); - { - signed int _index2 = (10-1); - for (;(_index2>=0);((void)(--_index2))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[_index2]) /* ^?{} */); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object33) /* ^?{} */); - ((void)((*___dst__4sVad_1).__anonymous_object32) /* ^?{} */); } static inline struct Vad ___operator_assign__F4sVad_4sVad4sVad_autogen___1(struct Vad *___dst__4sVad_1, struct Vad ___src__4sVad_1){ struct Vad ___ret__4sVad_1; - ((void)((*___dst__4sVad_1).__anonymous_object32=___src__4sVad_1.__anonymous_object32)); - ((void)((*___dst__4sVad_1).__anonymous_object33=___src__4sVad_1.__anonymous_object33)); - { - signed int _index3 = 0; - for (;(_index3<10);((void)(++_index3))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[_index3]=___src__4sVad_1.__anonymous_object34[_index3])); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object35=___src__4sVad_1.__anonymous_object35)); ((void)___constructor__F_4sVad4sVad_autogen___1((&___ret__4sVad_1), (*___dst__4sVad_1))); return ___ret__4sVad_1; } -static inline void ___constructor__F_4sVadi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object46){ - ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object46) /* ?{} */); - ((void)((*___dst__4sVad_1).__anonymous_object33) /* ?{} */); - { - signed int _index4 = 0; - for (;(_index4<10);((void)(++_index4))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[_index4]) /* ?{} */); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */); -} -static inline void ___constructor__F_4sVadiPi_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object47, __attribute__ ((unused,unused)) signed int *__anonymous_object48){ - ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object47) /* ?{} */); - ((void)((*___dst__4sVad_1).__anonymous_object33=__anonymous_object48) /* ?{} */); - { - signed int _index5 = 0; - for (;(_index5<10);((void)(++_index5))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[_index5]) /* ?{} */); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */); -} -static inline void ___constructor__F_4sVadiPiA0i_autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object49, __attribute__ ((unused,unused)) signed int *__anonymous_object50, __attribute__ ((unused,unused)) signed int __anonymous_object51[((unsigned int )10)]){ - ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object49) /* ?{} */); - ((void)((*___dst__4sVad_1).__anonymous_object33=__anonymous_object50) /* ?{} */); - { - signed int _index6 = 0; - for (;(_index6<10);((void)(++_index6))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[_index6]=__anonymous_object51[_index6]) /* ?{} */); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object35) /* ?{} */); -} -static inline void ___constructor__F_4sVadiPiA0iFi___autogen___1(struct Vad *___dst__4sVad_1, __attribute__ ((unused)) signed int __anonymous_object52, __attribute__ ((unused,unused)) signed int *__anonymous_object53, __attribute__ ((unused,unused)) signed int __anonymous_object54[((unsigned int )10)], __attribute__ ((unused,unused)) signed int (*__anonymous_object55)()){ - ((void)((*___dst__4sVad_1).__anonymous_object32=__anonymous_object52) /* ?{} */); - ((void)((*___dst__4sVad_1).__anonymous_object33=__anonymous_object53) /* ?{} */); - { - signed int _index7 = 0; - for (;(_index7<10);((void)(++_index7))) { - ((void)((*___dst__4sVad_1).__anonymous_object34[_index7]=__anonymous_object54[_index7]) /* ?{} */); - } - - } - - ((void)((*___dst__4sVad_1).__anonymous_object35=__anonymous_object55) /* ?{} */); -} Index: src/tests/.expect/declarationErrors.txt =================================================================== --- src/tests/.expect/declarationErrors.txt (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/tests/.expect/declarationErrors.txt (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -17,5 +17,5 @@ -declarationErrors.c:22:1 error: duplicate static in declaration of x6: static const volatile instance of type Int +declarationErrors.c:22:1 error: duplicate static in declaration of x6: static const volatile Int declarationErrors.c:24:1 error: duplicate const in declaration of f01: static inline function Index: src/tests/attributes.c =================================================================== --- src/tests/attributes.c (revision cbdf56541cc265d624bb052bc9234bf2ebbb1641) +++ src/tests/attributes.c (revision 2514607d289661cb73e88d94ca4daf01d5f7bda5) @@ -10,6 +10,6 @@ // Created On : Mon Feb 6 16:07:02 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Sun Jul 8 21:12:07 2018 -// Update Count : 8 +// Last Modified On : Thu Jul 19 13:50:51 2018 +// Update Count : 15 // @@ -42,5 +42,4 @@ __attribute__(( unused )) int f5 __attribute__(( unused )); __attribute__(( used )) int f6 __attribute__(( packed )), f7 __attribute__(( unused )) __attribute__(( unused )), __attribute__(( used )) f8 __attribute__(( unused )); - int __attribute__(( unused )); int ( ( * (f9) __attribute__(( unused )) ) __attribute__(( unused )) ); }; @@ -149,7 +148,6 @@ struct Vad { int __attribute__(( unused )); - int __attribute__(( unused )) * __attribute__(( unused )); - int __attribute__(( unused )) [10] __attribute__(( unused )); - int __attribute__(( unused )) (*)() __attribute__(( unused )); + int __attribute__(( unused )) :4; + int __attribute__(( unused )) :4, __attribute__(( unused )) :6; };