Changeset 7804e2a for src

Timestamp:

Aug 2, 2018, 5:15:21 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

c20fafd

Parents:

4285544e

Message:

Minor updates to name mangling to eliminate overlaps

Location:

src/SymTab

Files:

• Mangler.cc (modified) (3 diffs)
• Mangler.h (modified) (2 diffs)
• ManglerCommon.cc (modified) (2 diffs)

src/SymTab/Mangler.cc

@@ -144 +144 @@
                         void Mangler::postvisit( VoidType * voidType ) {
                                 printQualifiers( voidType );
-                                mangleName << Encoding::voidType;
+                                mangleName << Encoding::void_t;
                         }
 
@@ -195 +195 @@
                                 inFunctionType = true;
                                 std::list< Type* > returnTypes = getTypes( functionType->returnVals );
-                                if (returnTypes.empty()) mangleName << Encoding::voidType;
+                                if (returnTypes.empty()) mangleName << Encoding::void_t;
                                 else acceptAll( returnTypes, *visitor );
                                 mangleName << "_";
@@ -223 +223 @@
 
                         void Mangler::postvisit( StructInstType * aggregateUseType ) {
-                                mangleRef( aggregateUseType, "s" );
+                                mangleRef( aggregateUseType, Encoding::struct_t );
                         }
 
                         void Mangler::postvisit( UnionInstType * aggregateUseType ) {
-                                mangleRef( aggregateUseType, "u" );
+                                mangleRef( aggregateUseType, Encoding::union_t );
                         }
 
                         void Mangler::postvisit( EnumInstType * aggregateUseType ) {
-                                mangleRef( aggregateUseType, "e" );
+                                mangleRef( aggregateUseType, Encoding::enum_t );
                         }
 

src/SymTab/Mangler.h

@@ -46 +46 @@
                         extern const std::map<int, std::string> qualifiers;
 
-                        extern const std::string voidType;
+                        extern const std::string void_t;
                         extern const std::string zero;
                         extern const std::string one;
@@ -56 +56 @@
                         extern const std::string qualifiedTypeStart;
                         extern const std::string qualifiedTypeEnd;
+
+                        extern const std::string struct_t;
+                        extern const std::string union_t;
+                        extern const std::string enum_t;
 
                         extern const std::string autogen;

src/SymTab/ManglerCommon.cc

@@ -64 +64 @@
 
                         const std::map<int, std::string> qualifiers = {
-                                { Type::Const, "C" },
+                                { Type::Const, "K" },
                                 { Type::Volatile, "V" },
                                 { Type::Atomic, "A" }, // A = Atomic, A0 = Array and forall parameter...
-                                { Type::Mutex, "M" },
+                                { Type::Mutex, "X" },
                                 { Type::Lvalue, "L" },
                         };
 
-                        const std::string voidType = "v";
+                        const std::string void_t = "v";
                         const std::string zero = "Z";
                         const std::string one = "O";
@@ -82 +82 @@
                         const std::string qualifiedTypeEnd = "E";
 
+                        const std::string struct_t = "S";
+                        const std::string union_t = "U";
+                        const std::string enum_t = "M";
+
                         const std::string autogen = "autogen__";
                         const std::string intrinsic = "intrinsic__";