Changeset ddae809

Timestamp:

Nov 2, 2017, 3:34:40 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

f9941ff

Parents:

000178a

Message:

Silence warnings for tuple assignment

File:

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

src/InitTweak/FixInit.cc

@@ -501 +501 @@
                 }
 
+                // 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() ) ) {
@@ -515 +529 @@
                         } 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() ) );
                         }