Changeset 2dcd80a for src/CodeGen/CodeGenerator.cc

Timestamp:

Dec 14, 2022, 12:23:42 PM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

441a6a7

Parents:

7d9598d8 (diff), d8bdf13 (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/CodeGen/CodeGenerator.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -290 +290 @@
                                         if ( obj->get_init() ) {
                                                 obj->get_init()->accept( *visitor );
-                                                last_val = ((ConstantExpr *)(((SingleInit *)(obj->init))->value))->constant.get_ival();
+                                                Expression* expr = ((SingleInit *)(obj->init))->value;
+                                                while ( auto temp = dynamic_cast<CastExpr *>(expr) ) {
+                                                        expr = temp->arg;
+                                                }
+                                                last_val = ((ConstantExpr *)expr)->constant.get_ival();
                                         } else {
                                                 output << ++last_val;