Changeset ea156ae for src/CodeGen/CodeGenerator.cc

Timestamp:

Sep 27, 2017, 5:31:02 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

549c006

Parents:

12914e9 (diff), fa16264 (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

@@ -540 +540 @@
                 extension( nameExpr );
                 OperatorInfo opInfo;
-                if ( operatorLookup( nameExpr->get_name(), opInfo ) ) {
-                        assert( opInfo.type == OT_CONSTANT );
-                        output << opInfo.symbol;
+                if ( operatorLookup( nameExpr->name, opInfo ) ) {
+                        if ( opInfo.type == OT_CONSTANT ) {
+                                output << opInfo.symbol;
+                        } else {
+                                output << opInfo.outputName;
+                        }
                 } else {
                         output << nameExpr->get_name();