Changeset 2e9b59b for src/Common

Timestamp:

Apr 19, 2022, 3:00:04 PM (4 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

5b84a321

Parents:

ba897d21 (diff), bb7c77d (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:

added benchmark and evaluations chapter to thesis

Location:

src/Common

Files:

• CodeLocationTools.cpp (modified) (5 diffs)
• CodeLocationTools.hpp (modified) (2 diffs)
• Eval.cc (modified) (1 diff)
• Examine.cc (modified) (4 diffs)
• Examine.h (modified) (1 diff)
• PassVisitor.impl.h (modified) (1 diff)

src/Common/CodeLocationTools.cpp

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Fri Dec  4 15:42:00 2020
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  1 09:14:39 2022
-// Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Mar 14 15:14:00 2022
+// Update Count     : 4
 //
 
@@ -112 +112 @@
     macro(ForStmt, Stmt) \
     macro(SwitchStmt, Stmt) \
-    macro(CaseStmt, Stmt) \
+    macro(CaseClause, CaseClause) \
     macro(BranchStmt, Stmt) \
     macro(ReturnStmt, Stmt) \
     macro(ThrowStmt, Stmt) \
     macro(TryStmt, Stmt) \
-    macro(CatchStmt, Stmt) \
-    macro(FinallyStmt, Stmt) \
+    macro(CatchClause, CatchClause) \
+    macro(FinallyClause, FinallyClause) \
     macro(SuspendStmt, Stmt) \
     macro(WaitForStmt, Stmt) \
@@ -147 +147 @@
     macro(CommaExpr, Expr) \
     macro(TypeExpr, Expr) \
+    macro(DimensionExpr, Expr) \
     macro(AsmExpr, Expr) \
     macro(ImplicitCopyCtorExpr, Expr) \
@@ -239 +240 @@
 };
 
+class LocalFillCore : public ast::WithGuards {
+        CodeLocation const * parent;
+public:
+        LocalFillCore( CodeLocation const & location ) : parent( &location ) {
+                assert( location.isSet() );
+        }
+
+        template<typename node_t>
+        auto previsit( node_t const * node )
+                        -> typename std::enable_if<has_code_location<node_t>::value, node_t const *>::type {
+                if ( node->location.isSet() ) {
+                        GuardValue( parent ) = &node->location;
+                        return node;
+                } else {
+                        node_t * mut = ast::mutate( node );
+                        mut->location = *parent;
+                        return mut;
+                }
+        }
+};
+
 } // namespace
 
@@ -278 +300 @@
         ast::Pass<FillCore>::run( unit );
 }
+
+ast::Node const * localFillCodeLocations(
+                CodeLocation const & location , ast::Node const * node ) {
+        ast::Pass<LocalFillCore> visitor( location );
+        return node->accept( visitor );
+}

src/Common/CodeLocationTools.hpp

@@ -10 +10 @@
 // Created On       : Fri Dec  4 15:35:00 2020
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Dec  9  9:53:00 2020
-// Update Count     : 1
+// Last Modified On : Mon Mar 14 15:14:00 2022
+// Update Count     : 2
 //
 
 #pragma once
 
+struct CodeLocation;
 namespace ast {
+        class Node;
         class TranslationUnit;
 }
@@ -28 +30 @@
 // Assign a nearby code-location to any unset code locations in the forest.
 void forceFillCodeLocations( ast::TranslationUnit & unit );
+
+// Fill in code-locations with a parent code location,
+// using the provided CodeLocation as the base.
+ast::Node const *
+        localFillCodeLocations( CodeLocation const &, ast::Node const * );

src/Common/Eval.cc

@@ -112 +112 @@
         }
 
-        void postvisit( const ast::VariableExpr * expr ) {
+        void postvisit( const ast::VariableExpr * expr ) { // No hit
                 if ( const ast::EnumInstType * inst = dynamic_cast<const ast::EnumInstType *>(expr->result.get()) ) {
                         if ( const ast::EnumDecl * decl = inst->base ) {

src/Common/Examine.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Examine.h --
+// Examine.cc -- Helpers for examining AST code.
 //
 // Author           : Andrew Beach
 // Created On       : Wed Sept 2 14:02 2020
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Sep  8 12:15 2020
-// Update Count     : 0
+// Last Modified On : Fri Dec 10 10:27 2021
+// Update Count     : 1
 //
 
 #include "Common/Examine.h"
 
+#include "AST/Type.hpp"
 #include "CodeGen/OperatorTable.h"
+#include "InitTweak/InitTweak.h"
 
 DeclarationWithType * isMainFor( FunctionDecl * func, AggregateDecl::Aggregate kind ) {
@@ -36 +38 @@
 
 namespace {
+
+// getTypeofThis but does some extra checks used in this module.
+const ast::Type * getTypeofThisSolo( const ast::FunctionDecl * func ) {
+        if ( 1 != func->params.size() ) {
+                return nullptr;
+        }
+        auto ref = func->type->params.front().as<ast::ReferenceType>();
+        return (ref) ? ref->base : nullptr;
+}
+
+}
+
+const ast::DeclWithType * isMainFor(
+                const ast::FunctionDecl * func, ast::AggregateDecl::Aggregate kind ) {
+        if ( "main" != func->name ) return nullptr;
+        if ( 1 != func->params.size() ) return nullptr;
+
+        auto param = func->params.front();
+
+        auto type = dynamic_cast<const ast::ReferenceType *>( param->get_type() );
+        if ( !type ) return nullptr;
+
+        auto obj = type->base.as<ast::StructInstType>();
+        if ( !obj ) return nullptr;
+
+        if ( kind != obj->base->kind ) return nullptr;
+
+        return param;
+}
+
+namespace {
         Type * getDestructorParam( FunctionDecl * func ) {
                 if ( !CodeGen::isDestructor( func->name ) ) return nullptr;
@@ -48 +81 @@
                 return nullptr;
         }
+
+const ast::Type * getDestructorParam( const ast::FunctionDecl * func ) {
+        if ( !CodeGen::isDestructor( func->name ) ) return nullptr;
+        //return InitTweak::getParamThis( func )->type;
+        return getTypeofThisSolo( func );
+}
+
 }
 
@@ -57 +97 @@
         return false;
 }
+
+bool isDestructorFor(
+                const ast::FunctionDecl * func, const ast::StructDecl * type_decl ) {
+        if ( const ast::Type * type = getDestructorParam( func ) ) {
+                auto stype = dynamic_cast<const ast::StructInstType *>( type );
+                return stype && stype->base.get() == type_decl;
+        }
+        return false;
+}

src/Common/Examine.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Examine.h --
+// Examine.h -- Helpers for examining AST code.
 //
 // Author           : Andrew Beach
 // Created On       : Wed Sept 2 13:57 2020
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Sep  8 12:08 2020
-// Update Count     : 0
+// Last Modified On : Fri Dec 10 10:28 2021
+// Update Count     : 1
 //
 
+#include "AST/Decl.hpp"
 #include "SynTree/Declaration.h"
 
 /// Check if this is a main function for a type of an aggregate kind.
 DeclarationWithType * isMainFor( FunctionDecl * func, AggregateDecl::Aggregate kind );
+const ast::DeclWithType * isMainFor(
+        const ast::FunctionDecl * func, ast::AggregateDecl::Aggregate kind );
 // Returns a pointer to the parameter if true, nullptr otherwise.
 
 /// Check if this function is a destructor for the given structure.
 bool isDestructorFor( FunctionDecl * func, StructDecl * type_decl );
+bool isDestructorFor(
+        const ast::FunctionDecl * func, const ast::StructDecl * type );

src/Common/PassVisitor.impl.h

@@ -754 +754 @@
 
         // unlike structs, traits, and unions, enums inject their members into the global scope
+        // if ( node->base ) maybeAccept_impl( node->base, *this ); // Need this? Maybe not?
         maybeAccept_impl( node->parameters, *this );
         maybeAccept_impl( node->members   , *this );