Changeset c6e2c18 for src/SymTab

Timestamp:

Nov 28, 2017, 10:21:50 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

9c35431

Parents:

c0d00b6 (diff), c029f4d (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 cleanup-dtors

Location:

src/SymTab

Files:

• Autogen.cc (modified) (2 diffs)
• Validate.cc (modified) (4 diffs)

src/SymTab/Autogen.cc

@@ -375 +375 @@
                                 continue;
                         }
-                        memCtorType->parameters.push_back( new ObjectDecl( field->name, Type::StorageClasses(), LinkageSpec::Cforall, 0, field->get_type()->clone(), 0 ) );
+                        // do not carry over field's attributes to parameter type
+                        Type * paramType = field->get_type()->clone();
+                        deleteAll( paramType->attributes );
+                        paramType->attributes.clear();
+                        // add a parameter corresponding to this field
+                        memCtorType->parameters.push_back( new ObjectDecl( field->name, Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType, nullptr ) );
                         FunctionDecl * ctor = genFunc( "?{}", memCtorType->clone(), functionNesting );
                         makeFieldCtorBody( aggregateDecl->members.begin(), aggregateDecl->members.end(), ctor );
@@ -506 +511 @@
                                 break;
                         }
-                        memCtorType->parameters.push_back( new ObjectDecl( field->name, Type::StorageClasses(), LinkageSpec::Cforall, nullptr, field->get_type()->clone(), nullptr ) );
+                        // do not carry over field's attributes to parameter type
+                        Type * paramType = field->get_type()->clone();
+                        deleteAll( paramType->attributes );
+                        paramType->attributes.clear();
+                        // add a parameter corresponding to this field
+                        memCtorType->parameters.push_back( new ObjectDecl( field->name, Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType, nullptr ) );
                         FunctionDecl * ctor = genFunc( "?{}", memCtorType->clone(), functionNesting );
                         ObjectDecl * srcParam = strict_dynamic_cast<ObjectDecl *>( ctor->type->parameters.back() );

src/SymTab/Validate.cc

@@ -201 +201 @@
                 Declaration * postmutate( TraitDecl * contextDecl );
 
+                void premutate( FunctionType * ftype );
+
           private:
                 template<typename AggDecl>
@@ -214 +216 @@
                 TypeDeclMap typedeclNames;
                 int scopeLevel;
+                bool inFunctionType = false;
         };
 
@@ -725 +728 @@
                         Type *ret = def->second.first->base->clone();
                         ret->get_qualifiers() |= typeInst->get_qualifiers();
+                        // attributes are not carried over from typedef to function parameters/return values
+                        if ( ! inFunctionType ) {
+                                ret->attributes.splice( ret->attributes.end(), typeInst->attributes );
+                        } else {
+                                deleteAll( ret->attributes );
+                                ret->attributes.clear();
+                        }
                         // place instance parameters on the typedef'd type
                         if ( ! typeInst->parameters.empty() ) {
@@ -901 +911 @@
         Declaration *EliminateTypedef::postmutate( TraitDecl * traitDecl ) {
                 return handleAggregate( traitDecl );
+        }
+
+        void EliminateTypedef::premutate( FunctionType * ) {
+                GuardValue( inFunctionType );
+                inFunctionType = true;
         }