Changeset 6e21aaf for src/CodeGen/CodeGenerator.cc

Timestamp:

Jun 26, 2022, 10:29:22 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

9b817e15

Parents:

8446c18 (diff), 91715ce1 (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) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -294 +294 @@
                                 } else {
                                         if ( obj->get_init() ) {
-                                                obj->get_init()->accept( *visitor ); 
+                                                obj->get_init()->accept( *visitor );
                                         } else {
                                                 // Should not reach here!
@@ -683 +683 @@
                 extension( variableExpr );
                 const OperatorInfo * opInfo;
-                if ( variableExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic && (opInfo = operatorLookup( variableExpr->get_var()->get_name() )) && opInfo->type == OT_CONSTANT ) {
+                if( dynamic_cast<ZeroType*>( variableExpr->get_var()->get_type() ) ) {
+                        output << "0";
+                } else if ( variableExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic && (opInfo = operatorLookup( variableExpr->get_var()->get_name() )) && opInfo->type == OT_CONSTANT ) {
                         output << opInfo->symbol;
                 } else {
-                        // if (dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type()) 
+                        // if (dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())
                         // && dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())->baseEnum->base) {
                         //      output << '(' <<genType(dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())->baseEnum->base, "", options) << ')';