Changeset 28f3a19 for src/SymTab/Mangler.cc

Timestamp:

Jun 27, 2018, 3:28:41 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

b21c77a

Parents:

0182bfa (diff), 63238a4 (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' into with_gc

File:

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

src/SymTab/Mangler.cc

@@ -171 +171 @@
                                         "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() < sizeof(btLetter)/sizeof(btLetter[0]) );
                                 mangleName << btLetter[ basicType->get_kind() ];
                         }
@@ -218 +225 @@
                                 GuardValue( inFunctionType );
                                 inFunctionType = true;
-                                std::list< Type* > returnTypes = getTypes( functionType->get_returnVals() );
+                                std::list< Type* > returnTypes = getTypes( functionType->returnVals );
                                 acceptAll( returnTypes, *visitor );
                                 mangleName << "_";
-                                std::list< Type* > paramTypes = getTypes( functionType->get_parameters() );
+                                std::list< Type* > paramTypes = getTypes( functionType->parameters );
                                 acceptAll( paramTypes, *visitor );
                                 mangleName << "_";
@@ -229 +236 @@
                                 printQualifiers( refType );
 
-                                mangleName << ( refType->get_name().length() + prefix.length() ) << prefix << refType->get_name();
+                                mangleName << ( refType->name.length() + prefix.length() ) << prefix << refType->name;
 
                                 if ( mangleGenericParams ) {
-                                        std::list< Expression* >& params = refType->get_parameters();
+                                        std::list< Expression* >& params = refType->parameters;
                                         if ( ! params.empty() ) {
                                                 mangleName << "_";
                                                 for ( std::list< Expression* >::const_iterator param = params.begin(); param != params.end(); ++param ) {
                                                         TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
-                                                        assertf(paramType, "Aggregate parameters should be type expressions: %s", toString(*param).c_str());
-                                                        maybeAccept( paramType->get_type(), *visitor );
+                                                        assertf(paramType, "Aggregate parameters should be type expressions: %s", toCString(*param));
+                                                        maybeAccept( paramType->type, *visitor );
                                                 }
                                                 mangleName << "_";