Changeset 800bae1 for src

Timestamp:

Jun 17, 2019, 3:37:00 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

54b3fde, 6e55240

Parents:

89faa82 (diff), aba20d2 (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) (3 diffs)
• Common/Stats/Heap.cc (modified) (1 diff)
• ResolvExpr/ResolveAssertions.cc (modified) (1 diff)
• SynTree/ApplicationExpr.cc (modified) (2 diffs)
• SynTree/Expression.h (modified) (2 diffs)

src/AST/Convert.cpp

@@ -576 +576 @@
                 if ( srcInferred.mode == ast::Expr::InferUnion::Params ) {
                         const ast::InferredParams &srcParams = srcInferred.inferParams();
-                        for (auto srcParam : srcParams) {
-                                tgtInferParams[srcParam.first] = ParamEntry(
+                        for (auto & srcParam : srcParams) {
+                                auto res = tgtInferParams.emplace(srcParam.first, ParamEntry(
                                         srcParam.second.decl,
                                         get<Declaration>().accept1(srcParam.second.declptr),
@@ -583 +583 @@
                                         get<Type>().accept1(srcParam.second.formalType),
                                         get<Expression>().accept1(srcParam.second.expr)
-                                );
+                                ));
+                                assert(res.second);
                         }
                 } else if ( srcInferred.mode == ast::Expr::InferUnion::Slots  ) {
@@ -1982 +1983 @@
                 if ( !oldInferParams.empty() ) {
                         ast::InferredParams &tgt = newInferred.inferParams();
-                        for (auto old : oldInferParams) {
+                        for (auto & old : oldInferParams) {
                                 tgt[old.first] = ast::ParamEntry(
                                         old.second.decl,

src/Common/Stats/Heap.cc

@@ -21 +21 @@
 #include <iostream>
 
-#if defined( NO_STATISTICS ) || defined( TCMALLOC )
-        #define NO_HEAP_STATISTICS
+#if defined(__has_feature)
+        #if __has_feature(address_sanitizer)
+                #define NO_HEAP_STATISTICS
+        # endif
+#endif
+
+#if defined( NO_STATISTICS ) || defined( TCMALLOC ) || defined(__SANITIZE_ADDRESS__)
+        #if !defined(NO_HEAP_STATISTICS)
+                #define NO_HEAP_STATISTICS
+        #endif
 #endif
 

src/ResolvExpr/ResolveAssertions.cc

@@ -325 +325 @@
                                         entry.second.expr = postmutate( entry.second.expr );
                                         // xxx - look at entry.second.inferParams?
-                                        expr->inferParams[ entry.first ] = entry.second;
+                                        auto res = expr->inferParams.emplace( entry.first, entry.second );
+                                        assert(res.second);
                                 }
                         }

src/SynTree/ApplicationExpr.cc

@@ -28 +28 @@
 #include "Type.h"                // for Type, PointerType, FunctionType
 
+ParamEntry::ParamEntry( UniqueId decl, Declaration * declptr, Type * actualType, Type * formalType, Expression* expr )
+                : decl( decl ), declptr( declptr ), actualType( actualType ), formalType( formalType ), expr( expr ) {
+        }
+
 ParamEntry::ParamEntry( const ParamEntry &other ) :
-                decl( other.decl ), declptr( maybeClone( other.declptr ) ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) )/*, inferParams( new InferredParams( *other.inferParams ) )*/ {
-}
-
-ParamEntry &ParamEntry::operator=( const ParamEntry &other ) {
-        if ( &other == this ) return *this;
-        const_cast<UniqueId &>(decl) = other.decl;
-        const_cast<Declaration * &>(declptr) = maybeClone( other.declptr );
-        // xxx - this looks like a memory leak
-        const_cast<Type * &>(actualType) = maybeClone( other.actualType );
-        const_cast<Type * &>(formalType) = maybeClone( other.formalType );
-        expr = maybeClone( other.expr );
-        // *inferParams = *other.inferParams;
-        return *this;
+                decl( other.decl ), declptr( maybeClone( other.declptr ) ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) ) {
 }
 
@@ -52 +44 @@
 
 ParamEntry::ParamEntry( ParamEntry && other ) :
-                decl( other.decl ), declptr( other.declptr ), actualType( other.actualType ), formalType( other.formalType ), expr( other.expr )/*, inferParams( std::move( other.inferParams ) )*/ {
-        const_cast<Declaration * &>(other.declptr) = nullptr;
-        const_cast<Type * &>(other.actualType) = nullptr;
-        const_cast<Type * &>(other.formalType) = nullptr;
-        other.expr = nullptr;
+                decl( other.decl ), declptr( other.declptr ), actualType( other.actualType ), formalType( other.formalType ), expr( other.expr ) {
+        new (&other) ParamEntry();
 }
 
 ParamEntry & ParamEntry::operator=( ParamEntry && other ) {
         if ( &other == this ) return *this;
-        delete declptr;
-        delete actualType;
-        delete formalType;
-        delete expr;
-        const_cast<UniqueId &>(decl) = other.decl;
-        const_cast<Declaration * &>(declptr) = other.declptr;
-        const_cast<Type * &>(actualType) = other.actualType;
-        const_cast<Type * &>(formalType) = other.formalType;
-        expr = other.expr;
-        const_cast<Declaration * &>(other.declptr) = nullptr;
-        const_cast<Type * &>(other.actualType) = nullptr;
-        const_cast<Type * &>(other.formalType) = nullptr;
-        other.expr = nullptr;
-        // inferParams = std::move( other.inferParams );
+        this->~ParamEntry();
+        new (this) ParamEntry(other.decl, other.declptr, other.actualType, other.formalType, other.expr);
+        new (&other) ParamEntry();
+
         return *this;
 }

src/SynTree/Expression.h

@@ -39 +39 @@
 /// but subject to decay-to-pointer and type parameter renaming
 struct ParamEntry {
-        ParamEntry(): decl( 0 ), declptr(nullptr), actualType( 0 ), formalType( 0 ), expr( 0 )/*, inferParams( new InferredParams )*/ {}
-        ParamEntry( UniqueId decl, Declaration * declptr, Type * actualType, Type * formalType, Expression* expr )
-                : decl( decl ), declptr( declptr ), actualType( actualType ), formalType( formalType ), expr( expr )/*, inferParams( new InferredParams )*/ {
-        }
+        ParamEntry(): decl( 0 ), declptr( nullptr ), actualType( nullptr ), formalType( nullptr ), expr( nullptr ) {}
+        ParamEntry( UniqueId decl, Declaration * declptr, Type * actualType, Type * formalType, Expression* expr );
         ParamEntry( const ParamEntry & other );
         ParamEntry( ParamEntry && other );
         ~ParamEntry();
-        ParamEntry & operator=( const ParamEntry & other );
         ParamEntry & operator=( ParamEntry && other );
 
@@ -54 +51 @@
         Type * const formalType;
         Expression * expr;
-        // std::unique_ptr< InferredParams > inferParams;
 };