Changeset 2a301ff for src/Validate/ForallPointerDecay.cpp

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

• src/Validate/ForallPointerDecay.cpp (modified) (9 diffs)

src/Validate/ForallPointerDecay.cpp

@@ -23 +23 @@
 #include "Common/CodeLocation.h"
 #include "Common/ToString.hpp"
+#include "Common/utility.h"
 #include "SymTab/FixFunction.h"
-
-#include "AST/Print.hpp"
 
 namespace Validate {
@@ -51 +50 @@
 }
 
-template<typename T>
-void append( std::vector<T> & dst, std::vector<T> & src ) {
-        dst.reserve( dst.size() + src.size() );
-        for ( auto el : src ) {
-                dst.emplace_back( std::move( el ) );
-        }
-        src.clear();
+ast::FunctionDecl * updateAssertions( ast::FunctionDecl * decl ) {
+        auto type = ast::mutate( decl->type.get() );
+        type->assertions.clear();
+        type->assertions.reserve( decl->assertions.size() );
+        for ( auto & assertion : decl->assertions ) {
+                type->assertions.emplace_back(
+                        new ast::VariableExpr( decl->location, assertion ) );
+        }
+        decl->type = type;
+        return decl;
 }
 
@@ -96 +98 @@
                                         decl->get_type() ) ) {
                                 auto moreAsserts = expandTrait( traitInst );
-                                append( assertions, moreAsserts );
+                                splice( assertions, moreAsserts );
                         } else {
                                 assertions.push_back( decl );
@@ -108 +110 @@
         static TypeDeclVec expandTypeDecls( const TypeDeclVec & old ) {
                 TypeDeclVec typeDecls;
+                typeDecls.reserve( old.size() );
                 for ( const ast::TypeDecl * typeDecl : old ) {
                         typeDecls.push_back( ast::mutate_field( typeDecl,
@@ -123 +126 @@
                 mut->assertions = expandAssertions( decl->assertions );
                 // Update the assertion list on the type as well.
-                auto mutType = ast::mutate( mut->type.get() );
-                mutType->assertions.clear();
-                for ( auto & assertion : mut->assertions ) {
-                        mutType->assertions.emplace_back(
-                                new ast::VariableExpr( mut->location, assertion ) );
-                }
-                mut->type = mutType;
-                return mut;
+                return updateAssertions( mut );
         }
 
@@ -154 +150 @@
                 const std::vector<ast::ptr<ast::DeclWithType>> & assertions ) {
         std::vector<ast::ptr<ast::DeclWithType>> ret;
+        ret.reserve( assertions.size() );
         for ( const auto & assn : assertions ) {
                 bool isVoid = false;
@@ -187 +184 @@
         }
 
+        const ast::FunctionDecl * postvisit( const ast::FunctionDecl * decl ) {
+                if ( decl->assertions.empty() ) {
+                        return decl;
+                }
+                return updateAssertions( mutate( decl ) );
+        }
+
         const ast::StructDecl * previsit( const ast::StructDecl * decl ) {
                 if ( decl->params.empty() ) {
@@ -204 +208 @@
 };
 
-struct OberatorChecker final {
+struct OperatorChecker final {
         void previsit( const ast::ObjectDecl * obj ) {
-                if ( CodeGen::isOperator( obj->name ) ) {
-                        auto type = obj->type->stripDeclarator();
-                        if ( ! dynamic_cast< const ast::FunctionType * >( type ) ) {
-                                SemanticError( obj->location,
-                                        toCString( "operator ", obj->name.c_str(), " is not "
-                                        "a function or function pointer." ) );
-                        }
-                }
+                if ( !CodeGen::isOperator( obj->name ) ) return;
+                auto type = obj->type->stripDeclarator();
+                if ( dynamic_cast< const ast::FunctionType * >( type ) ) return;
+                SemanticError( obj->location,
+                        toCString( "operator ", obj->name.c_str(),
+                        " is not a function or function pointer." ) );
         }
 };
@@ -234 +236 @@
         ast::Pass<TraitExpander>::run( transUnit );
         ast::Pass<AssertionFunctionFixer>::run( transUnit );
-        ast::Pass<OberatorChecker>::run( transUnit );
+        ast::Pass<OperatorChecker>::run( transUnit );
+}
+
+void fixUniqueIds( ast::TranslationUnit & transUnit ) {
         ast::Pass<UniqueFixCore>::run( transUnit );
 }