Changeset 04e6f93 for src/SymTab/Mangler.cc

Timestamp:

Feb 27, 2020, 4:04:25 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

a037f85

Parents:

41efd33 (diff), 930b504 (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/SymTab/Mangler.cc (modified) (3 diffs)

src/SymTab/Mangler.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:40:29 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Dec 13 23:43:49 2019
-// Update Count     : 28
+// Last Modified On : Sat Feb 15 13:55:12 2020
+// Update Count     : 33
 //
 #include "Mangler.h"
@@ -128 +128 @@
                                 } // if
                                 mangleName << Encoding::manglePrefix;
-                                CodeGen::OperatorInfo opInfo;
-                                if ( operatorLookup( declaration->get_name(), opInfo ) ) {
-                                        mangleName << opInfo.outputName.size() << opInfo.outputName;
+                                const CodeGen::OperatorInfo * opInfo = CodeGen::operatorLookup( declaration->get_name() );
+                                if ( opInfo ) {
+                                        mangleName << opInfo->outputName.size() << opInfo->outputName;
                                 } else {
                                         mangleName << declaration->name.size() << declaration->name;
@@ -471 +471 @@
                         } // if
                         mangleName << Encoding::manglePrefix;
-                        CodeGen::OperatorInfo opInfo;
-                        if ( operatorLookup( decl->name, opInfo ) ) {
-                                mangleName << opInfo.outputName.size() << opInfo.outputName;
+                        const CodeGen::OperatorInfo * opInfo = CodeGen::operatorLookup( decl->name );
+                        if ( opInfo ) {
+                                mangleName << opInfo->outputName.size() << opInfo->outputName;
                         } else {
                                 mangleName << decl->name.size() << decl->name;