Changeset 8a0a64d9 for src/SymTab/Autogen.cc

Timestamp:

Nov 28, 2017, 11:49:12 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, resolv-new, with_gc

Children:

36982fc, 6c2ba38, d5a52cc

Parents:

8a78dd3 (diff), 8eb348a (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/SymTab/Autogen.cc (modified) (2 diffs)

src/SymTab/Autogen.cc

@@ -372 +372 @@
                                 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 );
@@ -503 +508 @@
                                 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() );