Changeset 10e81ac for src/SymTab

Timestamp:

May 27, 2016, 4:16:53 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

725f36f5

Parents:

aad5a48 (diff), 677c1be (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

Location:

src/SymTab

Files:

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

src/SymTab/Autogen.cc

@@ -10 +10 @@
 // Created On       : Thu Mar 03 15:45:56 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 11 13:22:03 2016
+// Last Modified On : Thu May 26 14:14:09 2016
 // Update Count     : 1
 //
@@ -163 +163 @@
         /// Creates a new type decl that's the same as src, but renamed and with only the ?=?, ?{} (default and copy), and ^?{} assertions (for complete types only)
         TypeDecl *cloneAndRename( TypeDecl *src, const std::string &name ) {
+                // TypeDecl *dst = new TypeDecl( name, src->get_storageClass(), 0, src->get_kind() );
+
+                // if ( src->get_kind() == TypeDecl::Any ) {
+                //      TypeInstType *opParamType = new TypeInstType( Type::Qualifiers(), name, dst );
+                //      FunctionType *opFunctionType = new FunctionType( Type::Qualifiers(), false );
+                //      opFunctionType->get_parameters().push_back(
+                //              new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), opParamType->clone() ), 0 ) );
+                //      FunctionDecl *ctorAssert = new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, opFunctionType->clone(), 0, false, false );
+                //      FunctionDecl *dtorAssert = new FunctionDecl( "^?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, opFunctionType->clone(), 0, false, false );
+
+                //      opFunctionType->get_parameters().push_back(
+                //              new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, opParamType, 0 ) );
+                //      FunctionDecl *copyCtorAssert = new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, opFunctionType->clone(), 0, false, false );
+
+                //      opFunctionType->get_returnVals().push_back(
+                //              new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, opParamType->clone(), 0 ) );
+                //      FunctionDecl *assignAssert = new FunctionDecl( "?=?", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, opFunctionType, 0, false, false );
+
+
+                //      dst->get_assertions().push_back( assignAssert );
+                //      dst->get_assertions().push_back( ctorAssert );
+                //      dst->get_assertions().push_back( dtorAssert );
+                //      dst->get_assertions().push_back( copyCtorAssert );
+                // }
+
                 TypeDecl *dst = new TypeDecl( src->get_name(), src->get_storageClass(), 0, src->get_kind() );
                 cloneAll(src->get_assertions(), dst->get_assertions());

src/SymTab/Validate.cc

@@ -385 +385 @@
 
         void Pass2::visit( StructDecl *structDecl ) {
+                // visit struct members first so that the types of self-referencing members are updated properly
+                Parent::visit( structDecl );
                 if ( ! structDecl->get_members().empty() ) {
                         ForwardStructsType::iterator fwds = forwardStructs.find( structDecl->get_name() );
@@ -394 +396 @@
                         } // if
                 } // if
-                Indexer::visit( structDecl );
         }
 
         void Pass2::visit( UnionDecl *unionDecl ) {
+                Parent::visit( unionDecl );
                 if ( ! unionDecl->get_members().empty() ) {
                         ForwardUnionsType::iterator fwds = forwardUnions.find( unionDecl->get_name() );
@@ -407 +409 @@
                         } // if
                 } // if
-                Indexer::visit( unionDecl );
         }