Changeset e01d2f6

Timestamp:

Jul 23, 2022, 5:41:47 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

1988572

Parents:

05b400a (diff), 5ce7f4a (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Files:

• libcfa/src/Makefile.am (modified) (2 diffs)
• src/GenPoly/Box.cc (modified) (5 diffs)

libcfa/src/Makefile.am

@@ -216 +216 @@
 nobase_cfa_include_HEADERS = ${stdhdr} ${inst_headers_src} ${inst_headers_nosrc} ${inst_thread_headers_src} ${inst_thread_headers_nosrc}
 EXTRA_DIST = stdhdr
+DISTCLEANFILES = $(libdeps) $(thread_libdeps)
 
 #----------------------------------------------------------------------------------------------------------------
@@ -221 +222 @@
         -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}
 
-distclean-local:
-        find ${builddir} -path '*.Plo' -delete
+#distclean-local:
+#       find ${builddir} -path '*.Plo' -delete
 
 

src/GenPoly/Box.cc

@@ -189 +189 @@
                         /// Enters a new scope for type-variables, adding the type variables from ty
                         void beginTypeScope( Type *ty );
-                        /// Exits the type-variable scope
-                        void endTypeScope();
                         /// Enters a new scope for knowLayouts and knownOffsets and queues exit calls
                         void beginGenericScope();
@@ -198 +196 @@
                         UniqueName bufNamer;                           ///< Namer for VLA buffers
                         Expression * addrMember = nullptr;             ///< AddressExpr argument is MemberExpr?
+                        bool expect_func_type = false;                 ///< used to avoid recursing too deep in type decls
                 };
 
@@ -1419 +1418 @@
                 void PolyGenericCalculator::beginGenericScope() {
                         GuardScope( *this );
+                        // We expect the first function type see to be the type relating to this scope
+                        // but any further type is probably some unrelated function pointer
+                        // keep track of which is the first
+                        GuardValue( expect_func_type );
+                        expect_func_type = true;
                 }
 
@@ -1468 +1472 @@
                 void PolyGenericCalculator::premutate( FunctionType *funcType ) {
                         beginTypeScope( funcType );
+
+                        GuardValue( expect_func_type );
+
+                        if(!expect_func_type) {
+                                GuardAction( [this]() {
+                                        knownLayouts.endScope();
+                                        knownOffsets.endScope();
+                                });
+                                // If this is the first function type we see
+                                // Then it's the type of the declaration and we care about it
+                                knownLayouts.beginScope();
+                                knownOffsets.beginScope();
+                        }
+
+                        // The other functions type we will see in this scope are probably functions parameters
+                        // they don't help us with the layout and offsets so don't mark them as known in this scope
+                        expect_func_type = false;
 
                         // make sure that any type information passed into the function is accounted for
@@ -1746 +1767 @@
                                 }
 
+                                // std::cout << "TRUE 2" << std::endl;
+
                                 return true;
                         } else if ( UnionInstType *unionTy = dynamic_cast< UnionInstType* >( ty ) ) {