Changeset 8217e8f

Timestamp:

Aug 14, 2017, 2:07:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

6cfe8bb

Parents:

36a5a77 (diff), bd46af4 (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 references

Files:

• doc/proposals/virtual.txt (modified) (3 diffs)
• src/Common/Indenter.h (modified) (1 diff)
• src/ControlStruct/MLEMutator.cc (modified) (2 diffs)
• src/Parser/DeclarationNode.cc (modified) (2 diffs)
• src/Parser/ParseNode.h (modified) (3 diffs)
• src/Parser/TypeData.cc (modified) (8 diffs)
• src/Parser/TypeData.h (modified) (2 diffs)
• src/SynTree/Declaration.h (modified) (5 diffs)
• src/tests/.expect/32/math1.txt (added)
• src/tests/.expect/32/math2.txt (moved) (moved from src/tests/.expect/32/math.txt) (3 diffs)
• src/tests/.expect/32/math3.txt (added)
• src/tests/.expect/64/math1.txt (added)
• src/tests/.expect/64/math2.txt (moved) (moved from src/tests/.expect/64/math.txt) (3 diffs)
• src/tests/.expect/64/math3.txt (added)
• src/tests/math.c (deleted)
• src/tests/math1.c (added)
• src/tests/math2.c (added)
• src/tests/math3.c (added)
• src/tests/pybin/tools.py (modified) (2 diffs)

doc/proposals/virtual.txt

@@ -147 +147 @@
 
 This gives us an important extra feature, runtime checking of the parent-child
-relationship with a C++ dynamic_cast like operation. Allowing checked
-conversions from trait references to more particular references, which works
-if the underlying type is, or is a child of, the new trait type.
+relationship with virtual cast, where a pointer (and maybe a reference) to
+a virtual type can be cast to another virtual cast. However the cast is
+dynamicly check and only occurs if the underlying type is a child of the type
+being cast to. Otherwise null is returned.
+
+(virtual TYPE)EXPR
+
+As an extention, the TYPE may be ommitted if it can be determained from
+context, for instance if the cast occurs on the right hand side of an
+assignment.
 
 Extension: Multiple Parents
@@ -251 +258 @@
 autogenerated and often unique.
 
+It may be worth looking into a way to force the vtable pointer to be in a
+particular location, which would save the storage to store the offset and
+maybe the offset operation itself (offset = 0). However it may not be worth
+introducing a new language feature for.
+As of writing, exceptions actually use this system.
+
 
 Keyword Usage:
@@ -276 +289 @@
 Calling free on a trait reference will free the memory for the object. It will
 leave the vtables alone, as those are (always?) statically allocated.
+
+
+Special Traits:
+
+trait is_virtual_parent(dtype parent, dtype child) { ... };
+
+There are others but I believe this one to be the most important. The trait
+holds if the parent type is a strict virtual ancestor (any number of levels)
+of child. It will have to exist at least internally to check for upcasts and
+it can also be used to optimize virtual casts into upcasts. Or a null value or
+error if the cast would never succeed. Exporting it to a special trait allows
+users to express that requirement in their own polymorphic code.
+
+
+Implementation:
+
+Before we can generate any of the nessasary code, the compiler has to get some
+additional information about the code that it currently does not collect.
+
+First it should establish all child->parent links so that it may travel up the
+hierarchy to grab the nessasary information, and create the actual parent
+pointers in the strict virtual tables. It should also maintain the connections
+between the virtual type (structure or trait), the vtable type and the vtable
+instance (or default instance for relaxed virtual if multiple are allowed). To
+this end a sub-node should be created with the nessasary pointers. Traits and
+structs with virtual can create an instance and store all the nessasary data.
+
+With the hierarchy in place it can generate the vtable type for each type,
+it will generally have a function pointer field for each type assertion in
+some consistant order. Strict virtual will also have a pointer to the parent's
+vtable and intrusive vtables will also have the offset to recover the original
+pointer. Sized types will also carry the size.
+
+Wheither the vtable is intrusive or not should also be save so that the trait
+object/reference/pointer knows if it has to store 1 or 2 pointers. A wrapper
+function will have to be generated for each type assertion so that they may
+be called on the trait type, these can probably be inlined.
+
+The virtual parameter will also have to be marked (implicately or explicately)
+until code generation so that the wrapper functions know where to go to get
+the vtable for the function look up. That could probably be added as a
+storageclass, although one that is only valid on type assertions.
+
+The generated vtable will than have to have a vtable instance created and
+filled with all the approprate values. Stricter matching may have to be used
+to ensure that the functions used are stable. It will also have to use
+".gnu.linkonce" or equilant to ensure only one copy exists in the final code
+base.

src/Common/Indenter.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// utility.h --
+// Indenter.h --
 //
-// Author           : Richard C. Bilson
-// Created On       : Mon May 18 07:44:20 2015
+// Author           : Rob Schluntz
+// Created On       : Fri Jun 30 16:55:23 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri May 5 11:03:00 2017
-// Update Count     : 32
+// Last Modified On : Fri Aug 11 11:15:00 2017
+// Update Count     : 1
 //
 

src/ControlStruct/MLEMutator.cc

@@ -154 +154 @@
                 return switchStmt;
         }
+
+        void addUnused( Statement * stmt, const Label & originalTarget ) {
+                // break/continue without a label doesn't need unused attribute
+                if ( originalTarget == "" ) return;
+                // add unused attribute to the originalTarget of a labelled break/continue
+                for ( Label & l : stmt->get_labels() ) {
+                        // find the label to add unused attribute to
+                        if ( l == originalTarget ) {
+                                for ( Attribute * attr : l.get_attributes() ) {
+                                        // ensure attribute isn't added twice
+                                        if ( attr->get_name() == "unused" ) return;
+                                }
+                                l.get_attributes().push_back( new Attribute( "unused" ) );
+                                return;
+                        }
+                }
+                assertf( false, "Could not find label '%s' on statement %s", originalTarget.get_name().c_str(), toString( stmt ).c_str() );
+        }
+
 
         Statement *MLEMutator::mutate( BranchStmt *branchStmt ) throw ( SemanticError ) {
@@ -204 +223 @@
                 } // switch
 
+                // add unused attribute to label to silence warnings
+                addUnused( targetEntry->get_controlStructure(), branchStmt->get_originalTarget() );
+
                 // transform break/continue statements into goto to simplify later handling of branches
                 delete branchStmt;

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul 14 16:55:00 2017
-// Update Count     : 1020
+// Last Modified On : Thr Aug 10 17:02:00 2017
+// Update Count     : 1021
 //
 
@@ -275 +275 @@
         return newnode;
 } // DeclarationNode::newEnumConstant
-
-DeclarationNode * DeclarationNode::newTreeStruct( Aggregate kind, const string * name, const string * parent, ExpressionNode * actuals, DeclarationNode * fields, bool body ) {
-        assert( name );
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Aggregate );
-        newnode->type->aggregate.kind = kind;
-        newnode->type->aggregate.name = name;
-        newnode->type->aggregate.actuals = actuals;
-        newnode->type->aggregate.fields = fields;
-        newnode->type->aggregate.body = body;
-        newnode->type->aggregate.tagged = true;
-        newnode->type->aggregate.parent = parent;
-        return newnode;
-} // DeclarationNode::newTreeStruct
 
 DeclarationNode * DeclarationNode::newName( string * name ) {

src/Parser/ParseNode.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 27 12:08:08 2017
-// Update Count     : 788
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug 10 16:54:00 2017
+// Update Count     : 789
 //
 
@@ -248 +248 @@
         static DeclarationNode * newAsmStmt( StatementNode * stmt ); // gcc external asm statement
 
-        // Perhaps this would best fold into newAggragate.
-        static DeclarationNode * newTreeStruct( Aggregate kind, const std::string * name, const std::string * parent, ExpressionNode * actuals, DeclarationNode * fields, bool body );
-
         DeclarationNode();
         ~DeclarationNode();
@@ -335 +332 @@
 
         static UniqueName anonymous;
-
-        // Temp to test TreeStruct
-        const std::string * parent_name;
 }; // DeclarationNode
 

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Aug  9 13:50:00 2017
-// Update Count     : 567
+// Last Modified On : Mon Aug 14 10:41:00 2017
+// Update Count     : 568
 //
 
@@ -64 +64 @@
                 aggregate.fields = nullptr;
                 aggregate.body = false;
-                aggregate.tagged = false;
-                aggregate.parent = nullptr;
                 break;
           case AggregateInst:
@@ -125 +123 @@
                 delete aggregate.actuals;
                 delete aggregate.fields;
-                delete aggregate.parent;
                 // delete aggregate;
                 break;
@@ -640 +637 @@
         switch ( td->aggregate.kind ) {
           case DeclarationNode::Struct:
-                if ( td->aggregate.tagged ) {
-                        at = new StructDecl( *td->aggregate.name, td->aggregate.parent, attributes, linkage );
-                        buildForall( td->aggregate.params, at->get_parameters() );
-                        break;
-                }
           case DeclarationNode::Coroutine:
           case DeclarationNode::Monitor:
@@ -652 +644 @@
                 break;
           case DeclarationNode::Union:
-                at = new UnionDecl( *td->aggregate.name, attributes );
+                at = new UnionDecl( *td->aggregate.name, attributes, linkage );
                 buildForall( td->aggregate.params, at->get_parameters() );
                 break;
           case DeclarationNode::Trait:
-                at = new TraitDecl( *td->aggregate.name, attributes );
+                at = new TraitDecl( *td->aggregate.name, attributes, linkage );
                 buildList( td->aggregate.params, at->get_parameters() );
                 break;
@@ -673 +665 @@
           case TypeData::Enum: {
                   if ( type->enumeration.body ) {
-                          EnumDecl * typedecl = buildEnum( type, attributes );
+                          EnumDecl * typedecl = buildEnum( type, attributes, linkage );
                           return new EnumInstType( buildQualifiers( type ), typedecl );
                   } else {
@@ -778 +770 @@
 } // buildSymbolic
 
-EnumDecl * buildEnum( const TypeData * td, std::list< Attribute * > attributes ) {
+EnumDecl * buildEnum( const TypeData * td, std::list< Attribute * > attributes, LinkageSpec::Spec linkage ) {
         assert( td->kind == TypeData::Enum );
-        EnumDecl * ret = new EnumDecl( *td->enumeration.name, attributes );
+        EnumDecl * ret = new EnumDecl( *td->enumeration.name, attributes, linkage );
         buildList( td->enumeration.constants, ret->get_members() );
         list< Declaration * >::iterator members = ret->get_members().begin();
@@ -831 +823 @@
                 return buildAggregate( td, attributes, linkage );
         } else if ( td->kind == TypeData::Enum ) {
-                return buildEnum( td, attributes );
+                return buildEnum( td, attributes, linkage );
         } else if ( td->kind == TypeData::Symbolic ) {
                 return buildSymbolic( td, name, scs, linkage );

src/Parser/TypeData.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:18:36 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:32:47 2017
-// Update Count     : 188
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Aug 14 10:38:00 2017
+// Update Count     : 189
 //
 
@@ -108 +108 @@
 ReferenceToType * buildAggInst( const TypeData * );
 TypeDecl * buildVariable( const TypeData * );
-EnumDecl * buildEnum( const TypeData *, std::list< Attribute * > );
+EnumDecl * buildEnum( const TypeData *, std::list< Attribute * >, LinkageSpec::Spec );
 TypeInstType * buildSymbolicInst( const TypeData * );
 TupleType * buildTuple( const TypeData * );

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Aug  9 14:45:00 2017
-// Update Count     : 126
+// Last Modified On : Mon Aug 14 10:15:00 2017
+// Update Count     : 128
 //
 
@@ -269 +269 @@
         typedef AggregateDecl Parent;
   public:
-        StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( kind ), tagged( false ), parent_name( "" ) {}
-        StructDecl( const std::string &name, const std::string *parent, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( DeclarationNode::Struct ), tagged( true ), parent_name( parent ? *parent : "" ) {}
-        StructDecl( const StructDecl &other ) : Parent( other ) {}
+        StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( kind ) {}
+        StructDecl( const StructDecl &other ) : Parent( other ), kind( other.kind ) {}
 
         bool is_coroutine() { return kind == DeclarationNode::Coroutine; }
@@ -277 +276 @@
         bool is_thread() { return kind == DeclarationNode::Thread; }
 
-        // Tagged/Tree Structure Excetion
-        bool get_tagged() { return tagged; }
-        void set_tagged( bool newValue ) { tagged = newValue; }
-        bool has_parent() { return parent_name != ""; }
-        std::string get_parentName() { return parent_name; }
-
         virtual StructDecl *clone() const { return new StructDecl( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -289 +282 @@
         DeclarationNode::Aggregate kind;
         virtual std::string typeString() const;
-
-        bool tagged;
-        std::string parent_name;
 };
 
@@ -323 +313 @@
         typedef AggregateDecl Parent;
   public:
-        TraitDecl( const std::string &name, const std::list< Attribute * > & attributes ) : Parent( name ) {
+        TraitDecl( const std::string &name, const std::list< Attribute * > & attributes, LinkageSpec::Spec linkage ) : Parent( name, attributes, linkage ) {
                 assertf( attributes.empty(), "attribute unsupported for traits" );
         }

src/tests/.expect/32/math2.txt

@@ -1 @@
-fmod:1 1 1 1 1 1
-remainder:-1 -1 -1
-remquo:7 0.0999999 7 0.1 7 0.0999999999999999999
-div:7, 0.2 7, 0.2 7, 0.2
-fma:-2 -2 -2
-fdim:2 2 2
-nan:nan nan nan
-exp:2.71828 2.71828182845905 2.71828182845904524 1.46869+2.28736i 1.46869393991589+2.28735528717884i 1.46869393991588516+2.28735528717884239i
-exp2:2 2 2
-expm1:1.71828 1.71828182845905 1.71828182845904524
-pow:1 1 1 0.273957+0.583701i 0.273957253830121+0.583700758758615i 0.273957253830121071+0.583700758758614628i
-16 256
-912673 256 64 -64 0.015625 -0.015625 18.3791736799526 0.264715-1.1922i
-log:0 0 0 0.346574+0.785398i 0.346573590279973+0.785398163397448i 0.346573590279972655+0.78539816339744831i
-log2:3 3 3
-log10:2 2 2
-log1p:0.693147 0.693147180559945 0.693147180559945309
-ilogb:0 0 0
-logb:3 3 3
-sqrt:1 1 1 1.09868+0.45509i 1.09868411346781+0.455089860562227i 1.09868411346780997+0.455089860562227341i
-cbrt:3 3 3
-hypot:1.41421 1.4142135623731 1.41421356237309505
 sin:0.841471 0.841470984807897 0.841470984807896507 1.29846+0.634964i 1.29845758141598+0.634963914784736i 1.29845758141597729+0.634963914784736108i
 cos:0.540302 0.54030230586814 0.540302305868139717 0.83373-0.988898i 0.833730025131149-0.988897705762865i 0.833730025131149049-0.988897705762865096i
@@ -27 +5 @@
 acos:0 0 0 0.904557-1.06128i 0.904556894302381-1.06127506190504i 0.904556894302381364-1.06127506190503565i
 atan:0.785398 0.785398163397448 0.78539816339744831 1.01722+0.402359i 1.01722196789785+0.402359478108525i 1.01722196789785137+0.402359478108525094i
-atan2:0.785398 0.785398163397448 0.78539816339744831 atan:0.785398 0.785398163397448 0.78539816339744831 sinh:1.1752 1.1752011936438 1.17520119364380146 0.634964+1.29846i 0.634963914784736+1.29845758141598i 0.634963914784736108+1.29845758141597729i
+atan2:0.785398 0.785398163397448 0.78539816339744831 atan:0.785398 0.785398163397448 0.78539816339744831
+sinh:1.1752 1.1752011936438 1.17520119364380146 0.634964+1.29846i 0.634963914784736+1.29845758141598i 0.634963914784736108+1.29845758141597729i
 cosh:1.54308 1.54308063481524 1.54308063481524378 0.83373+0.988898i 0.833730025131149+0.988897705762865i 0.833730025131149049+0.988897705762865096i
 tanh:0.761594 0.761594155955765 0.761594155955764888 1.08392+0.271753i 1.08392332733869+0.271752585319512i 1.08392332733869454+0.271752585319511717i
@@ -38 +17 @@
 lgamma:1.79176 1 1.79175946922805 1 1.791759469228055 1
 tgamma:6 6 6
-floor:1 1 1
-ceil:2 2 2
-trunc:3 3 3
-rint:2 2 2
-rint:2 2 2
-rint:2 2 2
-lrint:2 2 2
-llrint:2 2 2
-nearbyint:4 4 4
-round:2 2 2
-round:2 2 2
-round:2 2 2
-lround:2 2 2
-llround:2 2 2
-copysign:-1 -1 -1
-frexp:0.5 3 0.5 3 0.5 3
-ldexp:8 8 8
-modf:2 0.3 2 0.3 2 0.3
-modf:2, 0.3 2, 0.3 2, 0.3
-nextafter:2 2 2
-nexttoward:2 2 2
-scalbn:16 16 16
-scalbln:16 16 16

src/tests/.expect/64/math2.txt

@@ -1 @@
-fmod:1 1 1 1 1 1
-remainder:-1 -1 -1
-remquo:7 0.0999999 7 0.1 7 0.0999999999999999999
-div:7, 0.2 7, 0.2 7, 0.2
-fma:-2 -2 -2
-fdim:2 2 2
-nan:nan nan nan
-exp:2.71828 2.71828182845905 2.71828182845904524 1.46869+2.28736i 1.46869393991589+2.28735528717884i 1.46869393991588516+2.28735528717884239i
-exp2:2 2 2
-expm1:1.71828 1.71828182845905 1.71828182845904524
-pow:1 1 1 0.273957+0.583701i 0.273957253830121+0.583700758758615i 0.273957253830121071+0.583700758758614627i
-16 256
-912673 256 64 -64 0.015625 -0.015625 18.3791736799526 0.264715-1.1922i
-log:0 0 0 0.346574+0.785398i 0.346573590279973+0.785398163397448i 0.346573590279972655+0.78539816339744831i
-log2:3 3 3
-log10:2 2 2
-log1p:0.693147 0.693147180559945 0.693147180559945309
-ilogb:0 0 0
-logb:3 3 3
-sqrt:1 1 1 1.09868+0.45509i 1.09868411346781+0.455089860562227i 1.09868411346780997+0.455089860562227341i
-cbrt:3 3 3
-hypot:1.41421 1.4142135623731 1.41421356237309505
 sin:0.841471 0.841470984807897 0.841470984807896507 1.29846+0.634964i 1.29845758141598+0.634963914784736i 1.29845758141597729+0.634963914784736108i
 cos:0.540302 0.54030230586814 0.540302305868139717 0.83373-0.988898i 0.833730025131149-0.988897705762865i 0.833730025131149049-0.988897705762865096i
@@ -27 +5 @@
 acos:0 0 0 0.904557-1.06128i 0.904556894302381-1.06127506190504i 0.904556894302381364-1.06127506190503565i
 atan:0.785398 0.785398163397448 0.78539816339744831 1.01722+0.402359i 1.01722196789785+0.402359478108525i 1.01722196789785137+0.402359478108525094i
-atan2:0.785398 0.785398163397448 0.78539816339744831 atan:0.785398 0.785398163397448 0.78539816339744831 sinh:1.1752 1.1752011936438 1.17520119364380146 0.634964+1.29846i 0.634963914784736+1.29845758141598i 0.634963914784736108+1.29845758141597729i
+atan2:0.785398 0.785398163397448 0.78539816339744831 atan:0.785398 0.785398163397448 0.78539816339744831
+sinh:1.1752 1.1752011936438 1.17520119364380146 0.634964+1.29846i 0.634963914784736+1.29845758141598i 0.634963914784736108+1.29845758141597729i
 cosh:1.54308 1.54308063481524 1.54308063481524378 0.83373+0.988898i 0.833730025131149+0.988897705762865i 0.833730025131149049+0.988897705762865096i
 tanh:0.761594 0.761594155955765 0.761594155955764888 1.08392+0.271753i 1.08392332733869+0.271752585319512i 1.08392332733869454+0.271752585319511717i
@@ -38 +17 @@
 lgamma:1.79176 1 1.79175946922805 1 1.791759469228055 1
 tgamma:6 6 6
-floor:1 1 1
-ceil:2 2 2
-trunc:3 3 3
-rint:2 2 2
-rint:2 2 2
-rint:2 2 2
-lrint:2 2 2
-llrint:2 2 2
-nearbyint:4 4 4
-round:2 2 2
-round:2 2 2
-round:2 2 2
-lround:2 2 2
-llround:2 2 2
-copysign:-1 -1 -1
-frexp:0.5 3 0.5 3 0.5 3
-ldexp:8 8 8
-modf:2 0.3 2 0.3 2 0.3
-modf:2, 0.3 2, 0.3 2, 0.3
-nextafter:2 2 2
-nexttoward:2 2 2
-scalbn:16 16 16
-scalbln:16 16 16

src/tests/pybin/tools.py

@@ -85 +85 @@
                                 "--unchanged-group-format='%%=' \\"
                                 "--changed-group-format='\t\texpected :\n"
-                                "%%<\n"
+                                "%%<"
                                 "\t\tgot :\n"
-                                "%%>' \\\n"
+                                "%%>\n' \\\n"
                                 "--new-line-format='\t\t%%dn\t%%L' \\\n"
                                 "--old-line-format='\t\t%%dn\t%%L' \\\n"
@@ -94 +94 @@
 
         # fetch return code and error from the diff command
-        return sh(diff_cmd % (lhs, rhs), dry_run, False)        
+        return sh(diff_cmd % (lhs, rhs), dry_run, False)