Changeset 32490deb for src

Timestamp:

Jan 31, 2024, 6:40:25 PM (6 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

496ffc17

Parents:

c75b30a (diff), e71b09a (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

Location:

src

Files:

• Common/utility.h (modified) (1 diff)
• ResolvExpr/Resolver.cc (modified) (1 diff)

src/Common/utility.h

@@ -111 +111 @@
 };
 
-// -----------------------------------------------------------------------------
-// O(1) polymorphic integer ilog2, using clz, which returns the number of leading 0-bits, starting at the most
-// significant bit (single instruction on x86)
-
-template<typename T>
-inline
-#if defined(__GNUC__) && __GNUC__ > 4
-constexpr
-#endif
-T ilog2(const T & t) {
-        if(std::is_integral<T>::value) {
-                const constexpr int r = sizeof(t) * __CHAR_BIT__ - 1;
-                if( sizeof(T) == sizeof(unsigned       int) ) return r - __builtin_clz  ( t );
-                if( sizeof(T) == sizeof(unsigned      long) ) return r - __builtin_clzl ( t );
-                if( sizeof(T) == sizeof(unsigned long long) ) return r - __builtin_clzll( t );
-        }
-        assert(false);
-        return -1;
-} // ilog2
-
 // Local Variables: //
 // tab-width: 4 //

src/ResolvExpr/Resolver.cc

@@ -50 +50 @@
 
 namespace ResolvExpr {
-        template< typename iterator_t >
-        inline bool advance_to_mutex( iterator_t & it, const iterator_t & end ) {
-                while( it != end && !(*it)->get_type()->get_mutex() ) {
-                        it++;
-                }
-
-                return it != end;
-        }
-
         namespace {
                 /// Finds deleted expressions in an expression tree