Changeset b96ec83 for src/CodeGen

Timestamp:

Oct 3, 2017, 5:12:35 PM (8 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:

6840e7c

Parents:

1bc749f (diff), b0f601fa (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 'new-branch-stashed' into cleanup-dtors

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();