Changeset 90152a4 for src/InitTweak/InitTweak.cc

Timestamp:

Aug 27, 2018, 4:40:34 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:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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/InitTweak.cc (modified) (5 diffs)

src/InitTweak/InitTweak.cc

@@ -225 +225 @@
                                         // xxx - this shouldn't be an error, but need a way to
                                         // terminate without creating output, so should catch this error
-                                        throw SemanticError( "unbalanced list initializers" );
+                                        SemanticError( init->location, "unbalanced list initializers" );
                                 }
 
@@ -296 +296 @@
                 ObjectDecl * objDecl = dynamic_cast< ObjectDecl * >( dwt );
                 if ( ! objDecl ) return false;
-                return ! LinkageSpec::isBuiltin( objDecl->get_linkage() ) &&
-                        (objDecl->get_init() == nullptr ||
+                return (objDecl->get_init() == nullptr ||
                                 ( objDecl->get_init() != nullptr && objDecl->get_init()->get_maybeConstructed() ))
                         && ! objDecl->get_storageClasses().is_extern
@@ -409 +408 @@
                 return allofCtorDtor( stmt, []( Expression * callExpr ){
                         if ( ApplicationExpr * appExpr = isIntrinsicCallExpr( callExpr ) ) {
-                                FunctionType *funcType = GenPoly::getFunctionType( appExpr->get_function()->get_result() );
+                                FunctionType *funcType = GenPoly::getFunctionType( appExpr->function->result );
                                 assert( funcType );
                                 return funcType->get_parameters().size() == 1;
@@ -529 +528 @@
                 }
                 if ( dynamic_cast< ReferenceType * >( dst->result ) ) {
-                        dst = new AddressExpr( dst );
+                        for (int depth = dst->result->referenceDepth(); depth > 0; depth--) {
+                                dst = new AddressExpr( dst );
+                        }
                 } else {
                         dst = new CastExpr( dst, new ReferenceType( noQualifiers, dst->result->clone() ) );
                 }
                 if ( dynamic_cast< ReferenceType * >( src->result ) ) {
-                        src = new CastExpr( src, new ReferenceType( noQualifiers, src->result->stripReferences()->clone() ) );
+                        for (int depth = src->result->referenceDepth(); depth > 0; depth--) {
+                                src = new AddressExpr( src );
+                        }
+                        // src = new CastExpr( src, new ReferenceType( noQualifiers, src->result->stripReferences()->clone() ) );
                 }
                 return new ApplicationExpr( VariableExpr::functionPointer( assign ), { dst, src } );
@@ -564 +568 @@
                 void previsit( ConstantExpr * ) {}
 
+                void previsit( VariableExpr * varExpr ) {
+                        visit_children = false;
+
+                        if ( EnumInstType * inst = dynamic_cast< EnumInstType * >( varExpr->result ) ) {
+                                long long int value;
+                                if ( inst->baseEnum->valueOf( varExpr->var, value ) ) {
+                                        // enumerators are const expr
+                                        return;
+                                }
+                        }
+                        isConstExpr = false;
+                }
+
                 bool isConstExpr = true;
         };