Changeset 21bdce2 for src/SymTab/Mangler.cc
- Timestamp:
- May 21, 2018, 10:52:15 PM (6 years ago)
- 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc
- Children:
- 2f0a0678
- Parents:
- b12c036 (diff), 1596726 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/SymTab/Mangler.cc
rb12c036 r21bdce2 35 35 namespace { 36 36 /// Mangles names to a unique C identifier 37 struct Mangler : public WithShortCircuiting, public WithVisitorRef<Mangler> {37 struct Mangler : public WithShortCircuiting, public WithVisitorRef<Mangler>, public WithGuards { 38 38 Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams ); 39 39 Mangler( const Mangler & ) = delete; … … 55 55 void postvisit( EnumInstType * aggregateUseType ); 56 56 void postvisit( TypeInstType * aggregateUseType ); 57 void postvisit( TraitInstType * inst ); 57 58 void postvisit( TupleType * tupleType ); 58 59 void postvisit( VarArgsType * varArgsType ); … … 70 71 bool typeMode; ///< Produce a unique mangled name for a type 71 72 bool mangleGenericParams; ///< Include generic parameters in name mangling if true 73 bool inFunctionType = false; ///< Include type qualifiers if false. 72 74 73 75 void mangleDecl( DeclarationWithType *declaration ); … … 177 179 void Mangler::postvisit( PointerType * pointerType ) { 178 180 printQualifiers( pointerType ); 179 mangleName << "P"; 181 // mangle void (*f)() and void f() to the same name to prevent overloading on functions and function pointers 182 if ( ! dynamic_cast<FunctionType *>( pointerType->base ) ) mangleName << "P"; 180 183 maybeAccept( pointerType->base, *visitor ); 181 184 } … … 189 192 190 193 void Mangler::postvisit( ReferenceType * refType ) { 194 // don't print prefix (e.g. 'R') for reference types so that references and non-references do not overload. 195 // Further, do not print the qualifiers for a reference type (but do run printQualifers because of TypeDecls, etc.), 196 // by pretending every reference type is a function parameter. 197 GuardValue( inFunctionType ); 198 inFunctionType = true; 191 199 printQualifiers( refType ); 192 mangleName << "R";193 200 maybeAccept( refType->base, *visitor ); 194 201 } … … 206 213 printQualifiers( functionType ); 207 214 mangleName << "F"; 215 // turn on inFunctionType so that printQualifiers does not print most qualifiers for function parameters, 216 // since qualifiers on outermost parameter type do not differentiate function types, e.g., 217 // void (*)(const int) and void (*)(int) are the same type, but void (*)(const int *) and void (*)(int *) are different 218 GuardValue( inFunctionType ); 219 inFunctionType = true; 208 220 std::list< Type* > returnTypes = getTypes( functionType->get_returnVals() ); 209 221 acceptAll( returnTypes, *visitor ); … … 270 282 } 271 283 284 void Mangler::postvisit( TraitInstType * inst ) { 285 printQualifiers( inst ); 286 mangleName << "_Y" << inst->name << "_"; 287 } 288 272 289 void Mangler::postvisit( TupleType * tupleType ) { 273 290 printQualifiers( tupleType ); … … 304 321 // skip if not including qualifiers 305 322 if ( typeMode ) return; 306 307 323 if ( ! type->get_forall().empty() ) { 308 324 std::list< std::string > assertionNames; … … 337 353 mangleName << "_"; 338 354 } // if 339 if ( type->get_const() ) { 340 mangleName << "C"; 341 } // if 342 if ( type->get_volatile() ) { 343 mangleName << "V"; 344 } // if 355 if ( ! inFunctionType ) { 356 // these qualifiers do not distinguish the outermost type of a function parameter 357 if ( type->get_const() ) { 358 mangleName << "C"; 359 } // if 360 if ( type->get_volatile() ) { 361 mangleName << "V"; 362 } // if 363 // Removed due to restrict not affecting function compatibility in GCC 364 // if ( type->get_isRestrict() ) { 365 // mangleName << "E"; 366 // } // if 367 if ( type->get_atomic() ) { 368 mangleName << "A"; 369 } // if 370 } 345 371 if ( type->get_mutex() ) { 346 372 mangleName << "M"; 347 373 } // if 348 // Removed due to restrict not affecting function compatibility in GCC349 // if ( type->get_isRestrict() ) {350 // mangleName << "E";351 // } // if352 374 if ( type->get_lvalue() ) { 353 375 // mangle based on whether the type is lvalue, so that the resolver can differentiate lvalues and rvalues 354 376 mangleName << "L"; 355 377 } 356 if ( type->get_atomic() ) { 357 mangleName << "A"; 358 } // if 378 379 if ( inFunctionType ) { 380 // turn off inFunctionType so that types can be differentiated for nested qualifiers 381 GuardValue( inFunctionType ); 382 inFunctionType = false; 383 } 359 384 } 360 385 } // namespace
Note: See TracChangeset
for help on using the changeset viewer.