Changeset 136ccd7 for src/InitTweak

Timestamp:

Nov 3, 2017, 3:01:31 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

4ee36bf0

Parents:

4ee1efb (diff), 760ba67 (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' into cleanup-dtors

File:

• src/InitTweak/FixInit.cc (modified) (2 diffs)

src/InitTweak/FixInit.cc

@@ -504 +504 @@
                 }
 
+                // to prevent warnings (‘_unq0’ may be used uninitialized in this function),
+                // insert an appropriate zero initializer for UniqueExpr temporaries.
+                Initializer * makeInit( Type * t ) {
+                        if ( StructInstType * inst = dynamic_cast< StructInstType * >( t ) ) {
+                                // initizer for empty struct must be empty
+                                if ( inst->baseStruct->members.empty() ) return new ListInit({});
+                        } else if ( UnionInstType * inst = dynamic_cast< UnionInstType * >( t ) ) {
+                                // initizer for empty union must be empty
+                                if ( inst->baseUnion->members.empty() ) return new ListInit({});
+                        }
+
+                        return new ListInit( { new SingleInit( new ConstantExpr( Constant::from_int( 0 ) ) ) } );
+                }
+
                 void ResolveCopyCtors::postvisit( UniqueExpr * unqExpr ) {
                         if ( vars.count( unqExpr->get_id() ) ) {
@@ -518 +532 @@
                         } else {
                                 // expr isn't a call expr, so create a new temporary variable to use to hold the value of the unique expression
-                                unqExpr->set_object( ObjectDecl::newObject( toString("_unq", unqExpr->get_id()), unqExpr->get_result()->clone(), nullptr ) );
+                                unqExpr->set_object( ObjectDecl::newObject( toString("_unq", unqExpr->get_id()), unqExpr->get_result()->clone(), makeInit( unqExpr->get_result() ) ) );
                                 unqExpr->set_var( new VariableExpr( unqExpr->get_object() ) );
                         }