Changeset 936a287 for src

Timestamp:

Mar 30, 2017, 5:21:14 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

077810d, 72dc82a

Parents:

fbcde64 (diff), a4dd728 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src

Files:

• InitTweak/FixInit.cc (modified) (2 diffs)
• InitTweak/GenInit.cc (modified) (1 diff)
• libcfa/iostream.c (modified) (1 diff)

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/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,