Changeset d150ea2

Timestamp:

Feb 19, 2017, 10:23:23 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

a98b2cc, bd9bcc8

Parents:

e7cc8cb (diff), 0ca9dea (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 plg2:software/cfa/cfa-cc

Location:

src

Files:

• CodeGen/Generate.cc (modified) (2 diffs)
• InitTweak/FixInit.cc (modified) (1 diff)
• InitTweak/InitTweak.cc (modified) (1 diff)
• InitTweak/InitTweak.h (modified) (1 diff)
• ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)
• ResolvExpr/AlternativeFinder.h (modified) (1 diff)
• ResolvExpr/Resolver.cc (modified) (1 diff)
• Tuples/TupleExpansion.cc (modified) (4 diffs)
• tests/.expect/32/KRfunctions.txt (added)
• tests/.expect/64/KRfunctions.txt (moved) (moved from src/tests/.expect/KRfunctions.txt)
• tests/dtor-early-exit.c (modified) (3 diffs)

src/CodeGen/Generate.cc

@@ -22 +22 @@
 #include "SynTree/Declaration.h"
 #include "CodeGenerator.h"
+#include "Tuples/Tuples.h"
 
 using namespace std;
@@ -28 +29 @@
         void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty ) {
                 CodeGen::CodeGenerator cgv( os, pretty );
-
-                for ( std::list<Declaration *>::iterator i = translationUnit.begin(); i != translationUnit.end();  i++ ) {
-                        if ( LinkageSpec::isGeneratable( (*i)->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( (*i)->get_linkage() ) ) ) {
-                                (*i)->accept(cgv);
-                                if ( doSemicolon( *i ) ) {
+                for ( auto & dcl : translationUnit ) {
+                        if ( LinkageSpec::isGeneratable( dcl->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( dcl->get_linkage() ) ) ) {
+                                dcl->accept(cgv);
+                                if ( doSemicolon( dcl ) ) {
                                         os << ";";
                                 } // if

src/InitTweak/FixInit.cc

@@ -1116 +1116 @@
                         // xxx - is the size check necessary?
                         assert( ctorExpr->has_result() && ctorExpr->get_result()->size() == 1 );
+
+                        // xxx - ideally we would reuse the temporary generated from the copy constructor passes from within firstArg if it exists and not generate a temporary if it's unnecessary.
                         ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, ctorExpr->get_result()->clone(), nullptr );
                         addDeclaration( tmp );

src/InitTweak/InitTweak.cc

@@ -332 +332 @@
                         return nullptr;
                 }
+        }
+
+        DeclarationWithType * getFunction( Expression * expr ) {
+                if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr ) ) {
+                        return getCalledFunction( appExpr->get_function() );
+                } else if ( UntypedExpr * untyped = dynamic_cast< UntypedExpr * > ( expr ) ) {
+                        return getCalledFunction( untyped->get_function() );
+                }
+                assertf( false, "getFunction received unknown expression: %s", toString( expr ).c_str() );
         }
 

src/InitTweak/InitTweak.h

@@ -51 +51 @@
         bool checkInitDepth( ObjectDecl * objDecl );
 
-  /// Non-Null if expr is a call expression whose target function is intrinsic
-  ApplicationExpr * isIntrinsicCallExpr( Expression * expr );
+        /// returns the declaration of the function called by the expr (must be ApplicationExpr or UntypedExpr)
+        DeclarationWithType * getFunction( Expression * expr );
+
+        /// Non-Null if expr is a call expression whose target function is intrinsic
+        ApplicationExpr * isIntrinsicCallExpr( Expression * expr );
 
         /// True if stmt is a call statement where the function called is intrinsic and takes one parameter.

src/ResolvExpr/AlternativeFinder.cc

@@ -1044 +1044 @@
 
         void AlternativeFinder::visit( ConditionalExpr *conditionalExpr ) {
+                // find alternatives for condition
                 AlternativeFinder firstFinder( indexer, env );
                 firstFinder.findWithAdjustment( conditionalExpr->get_arg1() );
                 for ( AltList::const_iterator first = firstFinder.alternatives.begin(); first != firstFinder.alternatives.end(); ++first ) {
+                        // find alternatives for true expression
                         AlternativeFinder secondFinder( indexer, first->env );
                         secondFinder.findWithAdjustment( conditionalExpr->get_arg2() );
                         for ( AltList::const_iterator second = secondFinder.alternatives.begin(); second != secondFinder.alternatives.end(); ++second ) {
+                                // find alterantives for false expression
                                 AlternativeFinder thirdFinder( indexer, second->env );
                                 thirdFinder.findWithAdjustment( conditionalExpr->get_arg3() );
                                 for ( AltList::const_iterator third = thirdFinder.alternatives.begin(); third != thirdFinder.alternatives.end(); ++third ) {
+                                        // unify true and false types, then infer parameters to produce new alternatives
                                         OpenVarSet openVars;
                                         AssertionSet needAssertions, haveAssertions;
@@ -1079 +1083 @@
         }
 
+        void AlternativeFinder::visit( RangeExpr * rangeExpr ) {
+                // resolve low and high, accept alternatives whose low and high types unify
+                AlternativeFinder firstFinder( indexer, env );
+                firstFinder.findWithAdjustment( rangeExpr->get_low() );
+                for ( AltList::const_iterator first = firstFinder.alternatives.begin(); first != firstFinder.alternatives.end(); ++first ) {
+                        AlternativeFinder secondFinder( indexer, first->env );
+                        secondFinder.findWithAdjustment( rangeExpr->get_high() );
+                        for ( AltList::const_iterator second = secondFinder.alternatives.begin(); second != secondFinder.alternatives.end(); ++second ) {
+                                OpenVarSet openVars;
+                                AssertionSet needAssertions, haveAssertions;
+                                Alternative newAlt( 0, second->env, first->cost + second->cost );
+                                Type* commonType = nullptr;
+                                if ( unify( first->expr->get_result(), second->expr->get_result(), newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
+                                        RangeExpr *newExpr = new RangeExpr( first->expr->clone(), second->expr->clone() );
+                                        newExpr->set_result( commonType ? commonType : first->expr->get_result()->clone() );
+                                        newAlt.expr = newExpr;
+                                        inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( alternatives ) );
+                                } // if
+                        } // for
+                } // for
+        }
+
         void AlternativeFinder::visit( UntypedTupleExpr *tupleExpr ) {
                 std::list< AlternativeFinder > subExprAlternatives;

src/ResolvExpr/AlternativeFinder.h

@@ -66 +66 @@
                 virtual void visit( ImplicitCopyCtorExpr * impCpCtorExpr );
                 virtual void visit( ConstructorExpr * ctorExpr );
+                virtual void visit( RangeExpr * rangeExpr );
                 virtual void visit( UntypedTupleExpr *tupleExpr );
                 virtual void visit( TupleExpr *tupleExpr );

src/ResolvExpr/Resolver.cc

@@ -302 +302 @@
         }
 
-        template< typename SwitchClass >
-        void handleSwitchStmt( SwitchClass *switchStmt, SymTab::Indexer &visitor ) {
+        void Resolver::visit( SwitchStmt *switchStmt ) {
+                ValueGuard< Type * > oldInitContext( initContext );
                 Expression *newExpr;
-                newExpr = findIntegralExpression( switchStmt->get_condition(), visitor );
+                newExpr = findIntegralExpression( switchStmt->get_condition(), *this );
                 delete switchStmt->get_condition();
                 switchStmt->set_condition( newExpr );
 
-                visitor.Visitor::visit( switchStmt );
-        }
-
-        void Resolver::visit( SwitchStmt *switchStmt ) {
-                handleSwitchStmt( switchStmt, *this );
+                initContext = newExpr->get_result();
+                Parent::visit( switchStmt );
         }
 
         void Resolver::visit( CaseStmt *caseStmt ) {
+                if ( caseStmt->get_condition() ) {
+                        assert( initContext );
+                        CastExpr * castExpr = new CastExpr( caseStmt->get_condition(), initContext->clone() );
+                        Expression * newExpr = findSingleExpression( castExpr, *this );
+                        castExpr = safe_dynamic_cast< CastExpr * >( newExpr );
+                        caseStmt->set_condition( castExpr->get_arg() );
+                        castExpr->set_arg( nullptr );
+                        delete castExpr;
+                }
                 Parent::visit( caseStmt );
         }

src/Tuples/TupleExpansion.cc

@@ -29 +29 @@
 #include "ResolvExpr/typeops.h"
 #include "InitTweak/GenInit.h"
+#include "InitTweak/InitTweak.h"
 
 namespace Tuples {
@@ -78 +79 @@
                         }
                   private:
-                        ScopedMap< std::string, StructDecl * > typeMap;
+                        ScopedMap< int, StructDecl * > typeMap;
                 };
 
@@ -213 +214 @@
 
         Type * TupleTypeReplacer::mutate( TupleType * tupleType ) {
-                std::string mangleName = SymTab::Mangler::mangleType( tupleType );
                 tupleType = safe_dynamic_cast< TupleType * > ( Parent::mutate( tupleType ) );
-                if ( ! typeMap.count( mangleName ) ) {
-                        // generate struct type to replace tuple type
-                        // xxx - should fix this to only generate one tuple struct for each number of type parameters
-                        StructDecl * decl = new StructDecl( "_tuple_type_" + mangleName );
+                unsigned tupleSize = tupleType->size();
+                if ( ! typeMap.count( tupleSize ) ) {
+                        // generate struct type to replace tuple type based on the number of components in the tuple
+                        StructDecl * decl = new StructDecl( toString( "_tuple_type_", tupleSize  ) );
                         decl->set_body( true );
-                        for ( size_t i = 0; i < tupleType->size(); ++i ) {
+                        for ( size_t i = 0; i < tupleSize; ++i ) {
                                 TypeDecl * tyParam = new TypeDecl( toString("tuple_param_", i), DeclarationNode::NoStorageClass, nullptr, TypeDecl::Any );
                                 decl->get_members().push_back( new ObjectDecl( toString("field_", i), DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, new TypeInstType( Type::Qualifiers(), tyParam->get_name(), tyParam ), nullptr ) );
                                 decl->get_parameters().push_back( tyParam );
                         }
-                        if ( tupleType->size() == 0 ) {
+                        if ( tupleSize == 0 ) {
                                 // empty structs are not standard C. Add a dummy field to empty tuples to silence warnings when a compound literal Tuple0 is created.
                                 decl->get_members().push_back( new ObjectDecl( "dummy", DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr ) );
                         }
-                        typeMap[mangleName] = decl;
+                        typeMap[tupleSize] = decl;
                         addDeclaration( decl );
                 }
                 Type::Qualifiers qualifiers = tupleType->get_qualifiers();
 
-                StructDecl * decl = typeMap[mangleName];
+                StructDecl * decl = typeMap[tupleSize];
                 StructInstType * newType = new StructInstType( qualifiers, decl );
                 for ( Type * t : *tupleType ) {
@@ -337 +337 @@
                 public:
                         typedef Visitor Parent;
-                        virtual void visit( ApplicationExpr * appExpr ) { maybeImpure = true;   }
+                        virtual void visit( ApplicationExpr * appExpr ) {
+                                if ( DeclarationWithType * function = InitTweak::getFunction( appExpr ) ) {
+                                        if ( function->get_linkage() == LinkageSpec::Intrinsic ) {
+                                                if ( function->get_name() == "*?" || function->get_name() == "?[?]" ) {
+                                                        // intrinsic dereference, subscript are pure, but need to recursively look for impurity
+                                                        Parent::visit( appExpr );
+                                                        return;
+                                                }
+                                        }
+                                }
+                                maybeImpure = true;
+                        }
                         virtual void visit( UntypedExpr * untypedExpr ) { maybeImpure = true; }
                         bool maybeImpure = false;

src/tests/dtor-early-exit.c

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// dtor-early-exit.c -- 
-// 
+//
+// dtor-early-exit.c --
+//
 // Author           : Rob Schluntz
 // Created On       : Wed Aug 17 08:26:25 2016
@@ -12 +12 @@
 // Last Modified On : Wed Aug 17 08:29:37 2016
 // Update Count     : 2
-// 
+//
 
 #include <fstream>
@@ -213 +213 @@
                 // S_G-S_L = {}
         }
+#ifdef ERR2
         // S_G = {}
-#ifdef ERR2
         if (i == 5) goto L2; // this is an error in g++ because it skips initialization of y, x
         // S_L-S_G = { y, x } => non-empty, so error