Changes in src/SymTab/Mangler.cc [d1e0979:e73becf]

File:

• src/SymTab/Mangler.cc (modified) (3 diffs)

src/SymTab/Mangler.cc

@@ -117 +117 @@
                                         mangleName << declaration->get_name();
                                 } // if
-                                mangleName << nameSeparator;
+                                mangleName << "__";
                                 maybeAccept( declaration->get_type(), *visitor );
                                 if ( mangleOverridable && LinkageSpec::isOverridable( declaration->get_linkage() ) ) {
@@ -148 +148 @@
 
                         void Mangler::postvisit( BasicType * basicType ) {
+                                static const char *btLetter[] = {
+                                        "b",    // Bool
+                                        "c",    // Char
+                                        "Sc",   // SignedChar
+                                        "Uc",   // UnsignedChar
+                                        "s",    // ShortSignedInt
+                                        "Us",   // ShortUnsignedInt
+                                        "i",    // SignedInt
+                                        "Ui",   // UnsignedInt
+                                        "l",    // LongSignedInt
+                                        "Ul",   // LongUnsignedInt
+                                        "q",    // LongLongSignedInt
+                                        "Uq",   // LongLongUnsignedInt
+                                        "f",    // Float
+                                        "d",    // Double
+                                        "r",    // LongDouble
+                                        "Xf",   // FloatComplex
+                                        "Xd",   // DoubleComplex
+                                        "Xr",   // LongDoubleComplex
+                                        "If",   // FloatImaginary
+                                        "Id",   // DoubleImaginary
+                                        "Ir",   // LongDoubleImaginary
+                                        "w",    // SignedInt128
+                                        "Uw",   // UnsignedInt128
+                                        "x",    // Float80
+                                        "y",    // Float128
+                                };
+                                static_assert(
+                                        sizeof(btLetter)/sizeof(btLetter[0]) == BasicType::NUMBER_OF_BASIC_TYPES,
+                                        "Each basic type kind should have a corresponding mangler letter"
+                                );
+
                                 printQualifiers( basicType );
-                                assert( basicType->get_kind() < numBtLetter );
+                                assert( basicType->get_kind() < sizeof(btLetter)/sizeof(btLetter[0]) );
                                 mangleName << btLetter[ basicType->get_kind() ];
                         }
@@ -195 +227 @@
                                 inFunctionType = true;
                                 std::list< Type* > returnTypes = getTypes( functionType->returnVals );
-                                if (returnTypes.empty()) mangleName << "v";
-                                else acceptAll( returnTypes, *visitor );
+                                acceptAll( returnTypes, *visitor );
                                 mangleName << "_";
                                 std::list< Type* > paramTypes = getTypes( functionType->parameters );