Changeset 4ae2364 for src/AST/Convert.cpp

Timestamp:

Jun 3, 2019, 5:36:47 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

98a8290, ee574a2

Parents:

f474e91 (diff), dafe9e1 (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/AST/Convert.cpp (modified) (5 diffs)

src/AST/Convert.cpp

@@ -47 +47 @@
 namespace {
 
-// This is to preserve the SymTab::dereferenceOperator hack. It does not (and perhaps should not)
+// This is to preserve the FindSpecialDecls hack. It does not (and perhaps should not)
 // allow us to use the same stratagy in the new ast.
 ast::FunctionDecl * dereferenceOperator = nullptr;
+ast::StructDecl   * dtorStruct = nullptr;
+ast::FunctionDecl * dtorStructDestroy = nullptr;
 
 }
@@ -176 +178 @@
                         Validate::dereferenceOperator = decl;
                 }
+                if ( dtorStructDestroy == node ) {
+                        Validate::dtorStructDestroy = decl;
+                }
                 return declWithTypePostamble( decl, node );
         }
@@ -231 +236 @@
                         LinkageSpec::Spec( node->linkage.val )
                 );
+
+                if ( dtorStruct == node ) {
+                        Validate::dtorStruct = decl;
+                }
+
                 return aggregatePostamble( decl, node );
         }
@@ -1458 +1468 @@
                         dereferenceOperator = decl;
                 }
+
+                if ( Validate::dtorStructDestroy == old ) {
+                        dtorStructDestroy = decl;
+                }
         }
 
@@ -1479 +1493 @@
 
                 this->node = decl;
+
+                if ( Validate::dtorStruct == old ) {
+                        dtorStruct = decl;
+                }
         }