Changes in src/InitTweak/FixGlobalInit.cc [7baed7d:7b3f66b]

File:

• src/InitTweak/FixGlobalInit.cc (modified) (4 diffs)

src/InitTweak/FixGlobalInit.cc

@@ -22 +22 @@
 #include "SynTree/Initializer.h"
 #include "SynTree/Visitor.h"
-#include "SynTree/Attribute.h"
 #include <algorithm>
 
@@ -117 +116 @@
         GlobalFixer::GlobalFixer( const std::string & name, bool inLibrary ) : tempNamer( "_global_init" ) {
                 std::string fixedName = globalFunctionName( name );
-                std::list< Expression * > ctorParameters;
-                std::list< Expression * > dtorParameters;
-                if ( inLibrary ) {
-                        // Constructor/destructor attributes take a single parameter which
-                        // is the priority, with lower numbers meaning higher priority.
-                        // Functions specified with priority are guaranteed to run before
-                        // functions without a priority. To ensure that constructors and destructors
-                        // for library code are run before constructors and destructors for user code,
-                        // specify a priority when building the library. Priorities 0-100 are reserved by gcc.
-                        ctorParameters.push_back( new ConstantExpr( Constant::from_int( 101 ) ) );
-                        dtorParameters.push_back( new ConstantExpr( Constant::from_int( 101 ) ) );
-                }
-                initFunction = new FunctionDecl( "_init_" + fixedName, DeclarationNode::Static, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false );
-                initFunction->get_attributes().push_back( new Attribute( "constructor", ctorParameters ) );
-                destroyFunction = new FunctionDecl( "_destroy_" + fixedName, DeclarationNode::Static, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false );
-                destroyFunction->get_attributes().push_back( new Attribute( "destructor", dtorParameters ) );
+                initFunction = new FunctionDecl( "_init_" + fixedName, DeclarationNode::Static, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false, FunctionDecl::Attribute( FunctionDecl::Attribute::Constructor, inLibrary ? FunctionDecl::Attribute::High : FunctionDecl::Attribute::Default ) );
+
+                destroyFunction = new FunctionDecl( "_destroy_" + fixedName, DeclarationNode::Static, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false, FunctionDecl::Attribute( FunctionDecl::Attribute::Destructor, inLibrary ? FunctionDecl::Attribute::High : FunctionDecl::Attribute::Default ) );
         }
 
@@ -139 +125 @@
                 std::list< Statement * > & destroyStatements = destroyFunction->get_statements()->get_kids();
 
+                // if ( objDecl->get_init() == NULL ) return;
                 if ( ! tryConstruct( objDecl ) ) return; // don't construct @= or designated objects
+                if ( objDecl->get_type()->get_isConst() ) return; // temporary: can't assign to a const variable
                 if ( objDecl->get_storageClass() == DeclarationNode::Extern ) return;
                 // C allows you to initialize objects with constant expressions
@@ -158 +146 @@
                         init->get_args().push_back( new AddressExpr( new VariableExpr( objDecl ) ) );
                         init->get_args().push_back( new VariableExpr( newObj ) );
-                        initStatements.push_back( new ImplicitCtorDtorStmt( new ExprStmt( noLabels, init ) ) );
+                        initStatements.push_back( new ExprStmt( noLabels, init ) );
 
                         // add destructor calls to global destroy function
                         UntypedExpr * destroy = new UntypedExpr( new NameExpr( "^?{}" ) );
                         destroy->get_args().push_back( new AddressExpr( new VariableExpr( objDecl ) ) );
-                        destroyStatements.push_front( new ImplicitCtorDtorStmt( new ExprStmt( noLabels, destroy ) ) );
+                        destroyStatements.push_front( new ExprStmt( noLabels, destroy ) );
                 }
         }