Ignore:
Timestamp:
May 29, 2019, 10:22:31 AM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
f57dd25
Parents:
1259c35 (diff), eba615c (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/AST/Convert.cpp

    r1259c35 rebc0a85  
    1010// Created On       : Thu May 09 15::37::05 2019
    1111// Last Modified By : Andrew Beach
    12 // Last Modified On : Thu May 23 16:59:00 2019
    13 // Update Count     : 6
     12// Last Modified On : Tue May 28 12:00:00 2019
     13// Update Count     : 7
    1414//
    1515
     
    13371337                if ( ! old ) return nullptr;
    13381338                old->accept(*this);
    1339                 return strict_dynamic_cast< NewT * >( node );
     1339                ast::Node * ret = node;
     1340                node = nullptr;
     1341                return strict_dynamic_cast< NewT * >( ret );
    13401342        }
    13411343
     
    13501352                        a->accept( *this );
    13511353                        ret.emplace_back( strict_dynamic_cast< NewT * >(node) );
     1354                        node = nullptr;
    13521355                }
    13531356                return ret;
     
    18731876                        GET_LABELS_V(old->labels)
    18741877                );
     1878                cache.emplace( old, stmt );
     1879                stmt->callStmt = GET_ACCEPT_1(callStmt, Stmt);
    18751880                this->node = stmt;
    1876                 cache.emplace( old, this->node );
    1877                 stmt->callStmt = GET_ACCEPT_1(callStmt, Stmt);
    18781881        }
    18791882
Note: See TracChangeset for help on using the changeset viewer.