Changeset 7d651a6 for src/InitTweak/FixInitNew.cpp

Timestamp:

Nov 5, 2020, 7:25:03 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

3febb2d

Parents:

a3f5208a

Message:

fix static init crash

File:

• src/InitTweak/FixInitNew.cpp (modified) (2 diffs)

src/InitTweak/FixInitNew.cpp

@@ -864 +864 @@
                         if ( const ast::Stmt * ctor = ctorInit->ctor ) {
                                 if ( objDecl->storage.is_static ) {
+                                        addDataSectionAttribute(objDecl);
                                         // originally wanted to take advantage of gcc nested functions, but
                                         // we get memory errors with this approach. To remedy this, the static
@@ -947 +948 @@
                                                 objDecl->name = objDecl->name + staticNamer.newName();
                                                 objDecl->mangleName = Mangle::mangle( objDecl );
+                                                objDecl->init = nullptr;
 
                                                 // xxx - temporary hack: need to return a declaration, but want to hoist the current object out of this scope