Changeset 9cdfb4d0 for src/InitTweak/InitTweak.cc

Timestamp:

Jan 22, 2018, 3:09:01 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

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:

e23d20b

Parents:

326cd2b (diff), 4bf3b2b (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/InitTweak/InitTweak.cc (modified) (1 diff)

src/InitTweak/InitTweak.cc

@@ -564 +564 @@
                 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;
         };