Changeset 136ccd7 for src/SymTab

Timestamp:

Nov 3, 2017, 3:01:31 PM (7 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:

4ee36bf0

Parents:

4ee1efb (diff), 760ba67 (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) (1 diff)
• Mangler.cc (modified) (2 diffs)

src/SymTab/Autogen.cc

@@ -699 +699 @@
                         if ( TypeInstType * ty = dynamic_cast< TypeInstType * >( t ) ) {
                                 if ( ! done.count( ty->get_baseType() ) ) {
-                                        TypeDecl * newDecl = new TypeDecl( ty->get_baseType()->get_name(), Type::StorageClasses(), nullptr, TypeDecl::Any );
+                                        TypeDecl * newDecl = new TypeDecl( ty->get_baseType()->get_name(), Type::StorageClasses(), nullptr, TypeDecl::Dtype, true );
                                         TypeInstType * inst = new TypeInstType( Type::Qualifiers(), newDecl->get_name(), newDecl );
                                         newDecl->get_assertions().push_back( new FunctionDecl( "?=?", Type::StorageClasses(), LinkageSpec::Cforall, genAssignType( inst ), nullptr,

src/SymTab/Mangler.cc

@@ -214 +214 @@
                         numStream << varNum->second.first;
                         switch ( (TypeDecl::Kind )varNum->second.second ) {
-                          case TypeDecl::Any:
-                                mangleName << "t";
-                                break;
                           case TypeDecl::Dtype:
                                 mangleName << "d";
@@ -274 +271 @@
                         for ( Type::ForallList::iterator i = type->forall.begin(); i != type->forall.end(); ++i ) {
                                 switch ( (*i)->get_kind() ) {
-                                  case TypeDecl::Any:
-                                        tcount++;
-                                        break;
                                   case TypeDecl::Dtype:
                                         dcount++;