Changeset 4ae2364

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

Location:

src

Files:

• AST/Convert.cpp (modified) (5 diffs)
• AST/Node.hpp (modified) (3 diffs)
• AST/Type.hpp (modified) (1 diff)
• AST/TypeSubstitution.cpp (modified) (2 diffs)
• Validate/FindSpecialDecls.cc (modified) (1 diff)
• include/cassert (modified) (2 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;
+                }
         }
 

src/AST/Node.hpp

@@ -10 +10 @@
 // Created On       : Wed May 8 10:27:04 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu May 23 16:00:00 2019
-// Update Count     : 4
+// Last Modified On : Mon Jun  3 13:26:00 2019
+// Update Count     : 5
 //
 
@@ -107 +107 @@
         ptr_base() : node(nullptr) {}
         ptr_base( const node_t * n ) : node(n) { if( node ) _inc(node); }
-        ~ptr_base() { if( node ) _dec(node); }
+        ~ptr_base() { if( node ) { auto tmp = node; node = nullptr; _dec(tmp); } }
 
         ptr_base( const ptr_base & o ) : node(o.node) {
@@ -127 +127 @@
         template<typename o_node_t>
         ptr_base & operator=( const o_node_t * node ) {
-                assign( node ? strict_dynamic_cast<const node_t *>(node) : nullptr );
+                assign( strict_dynamic_cast<const node_t *, nullptr>(node) );
                 return *this;
         }

src/AST/Type.hpp

@@ -48 +48 @@
 
         Type * set_const( bool v ) { qualifiers.is_const = v; return this; }
+        Type * set_volatile( bool v ) { qualifiers.is_volatile = v; return this; }
         Type * set_restrict( bool v ) { qualifiers.is_restrict = v; return this; }
         Type * set_lvalue( bool v ) { qualifiers.is_lvalue = v; return this; }

src/AST/TypeSubstitution.cpp

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 15:54:35 2017
-// Update Count     : 4
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jun  3 13:26:00 2017
+// Update Count     : 5
 //
 
@@ -26 +26 @@
 }
 
-TypeSubstitution::~TypeSubstitution() {
-        for ( TypeEnvType::iterator i = typeEnv.begin(); i != typeEnv.end(); ++i ) {
-                delete( i->second );
-        }
-        for ( VarEnvType::iterator i = varEnv.begin(); i != varEnv.end(); ++i ) {
-                delete( i->second );
-        }
-}
+TypeSubstitution::~TypeSubstitution() {}
 
 TypeSubstitution &TypeSubstitution::operator=( const TypeSubstitution &other ) {

src/Validate/FindSpecialDecls.cc

@@ -26 +26 @@
 namespace Validate {
         Type * SizeType = nullptr;
-  FunctionDecl * dereferenceOperator = nullptr;
-  StructDecl * dtorStruct = nullptr;
-  FunctionDecl * dtorStructDestroy = nullptr;
+        FunctionDecl * dereferenceOperator = nullptr;
+        StructDecl * dtorStruct = nullptr;
+        FunctionDecl * dtorStructDestroy = nullptr;
 
         namespace {

src/include/cassert

@@ -10 +10 @@
 // Created On       : Thu Aug 18 13:19:26 2016
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu May 23 15:30:00 2017
-// Update Count     : 17
+// Last Modified On : Mon Jun  3 13:11:00 2017
+// Update Count     : 18
 //
 
@@ -43 +43 @@
 #endif
 
-enum StrictAllowNull {NonNull, AllowNull};
-
-template<typename T, StrictAllowNull nullable = NonNull, typename U>
+template<typename T, typename U>
 static inline T strict_dynamic_cast( const U & src ) {
-        if (nullable == AllowNull && src == nullptr) {
-                return nullptr;
-        }
         assert(src);
         T ret = dynamic_cast<T>(src);
         assertf(ret, "%s", toString(src).c_str());
         return ret;
+}
+
+template<typename T, decltype(nullptr) null, typename U>
+static inline T strict_dynamic_cast( const U & src ) {
+        return src ? strict_dynamic_cast<T, U>( src ) : nullptr;
 }