Changeset d3e4d6c for src/Common

Timestamp:

Aug 23, 2017, 6:22:07 PM (8 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:

87e08e24, cb811ac

Parents:

9f07232 (diff), bd37119 (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/Common

Files:

• PassVisitor.h (modified) (2 diffs)
• PassVisitor.impl.h (modified) (2 diffs)
• utility.h (modified) (2 diffs)

src/Common/PassVisitor.h

@@ -116 +116 @@
         virtual void visit( PointerType *pointerType ) override final;
         virtual void visit( ArrayType *arrayType ) override final;
+        virtual void visit( ReferenceType *referenceType ) override final;
         virtual void visit( FunctionType *functionType ) override final;
         virtual void visit( StructInstType *aggregateUseType ) override final;
@@ -202 +203 @@
         virtual Type* mutate( PointerType *pointerType ) override final;
         virtual Type* mutate( ArrayType *arrayType ) override final;
+        virtual Type* mutate( ReferenceType *referenceType ) override final;
         virtual Type* mutate( FunctionType *functionType ) override final;
         virtual Type* mutate( StructInstType *aggregateUseType ) override final;

src/Common/PassVisitor.impl.h

@@ -792 +792 @@
 
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( ReferenceType * node ) {
+        VISIT_BODY( node );
+}
+
+template< typename pass_type >
 void PassVisitor< pass_type >::visit( FunctionType * node ) {
         VISIT_BODY( node );
@@ -1129 +1134 @@
 
 template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( ReferenceType * node ) {
+        MUTATE_BODY( Type, node );
+}
+
+template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( FunctionType * node ) {
         MUTATE_BODY( Type, node );

src/Common/utility.h

@@ -310 +310 @@
 template< typename T1, typename T2 >
 struct group_iterate_t {
-        group_iterate_t( const T1 & v1, const T2 & v2 ) : args(v1, v2) {
-                assertf(v1.size() == v2.size(), "group iteration requires containers of the same size.");
+        group_iterate_t( bool skipBoundsCheck, const T1 & v1, const T2 & v2 ) : args(v1, v2) {
+                assertf(skipBoundsCheck || v1.size() == v2.size(), "group iteration requires containers of the same size: <%lu, %lu>.", v1.size(), v2.size());
         };
 
@@ -336 +336 @@
 };
 
+/// performs bounds check to ensure that all arguments are of the same length.
 template< typename... Args >
 group_iterate_t<Args...> group_iterate( Args &&... args ) {
-        return group_iterate_t<Args...>(std::forward<Args>( args )...);
+        return group_iterate_t<Args...>(false, std::forward<Args>( args )...);
+}
+
+/// does not perform a bounds check - requires user to ensure that iteration terminates when appropriate.
+template< typename... Args >
+group_iterate_t<Args...> unsafe_group_iterate( Args &&... args ) {
+        return group_iterate_t<Args...>(true, std::forward<Args>( args )...);
 }