Changeset 61e9c58 in git

Timestamp:

Oct 26, 2020, 6:02:25 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ba9e24e67185c12eb7966da1c68fcef2d90666d0

Parents:

4b24c1908038eb4e15e84478236d2f6eac46173c

Message:

opt: mpz_gcdext

File:

• factory/int_pp.cc (modified) (3 diffs)

factory/int_pp.cc

@@ -240 +240 @@
 InternalCF* InternalPrimePower::divsame( InternalCF * c )
 {
-    if ( c == this ) {
+    if ( c == this )
+    {
         if ( deleteObject() ) delete this;
         return CFFactory::basic( 1 );
     }
-    if ( getRefCount() > 1 ) {
+    if ( getRefCount() > 1 )
+    {
         decRefCount();
-        mpz_t dummy, a, b;
-        mpz_init( dummy ); mpz_init( a ); mpz_init( b );
+        mpz_t a, b;
+        mpz_init( a ); mpz_init( b );
+        #ifdef SING_NDEBUG
+        mpz_gcdext( NULL, a, b, primepow, MPI( c ) );
+        #else
+        mpz_t dummy; mpz_init( dummy );
         mpz_gcdext( dummy, a, b, primepow, MPI( c ) );
         ASSERT( mpz_cmp_si( dummy, 1 ) == 0, "illegal inversion" );
-        mpz_clear( dummy ); mpz_clear( a );
+        mpz_clear( dummy );
+        #endif
+        mpz_clear( a );
         if ( mpz_cmp_si( b, 0 ) < 0 )
             mpz_add( b, b, primepow );
@@ -257 +265 @@
         return new InternalPrimePower( b );
     }
-    else {
-        mpz_t dummy, a, b;
-        mpz_init( dummy ); mpz_init( a ); mpz_init( b );
+    else
+    {
+        mpz_t a, b; mpz_init( a ); mpz_init( b );
+        #ifdef SING_NDEBUG
+        mpz_gcdext( NULL, a, b, primepow, MPI( c ) );
+        #else
+        mpz_t dummy; mpz_init( dummy );
         mpz_gcdext( dummy, a, b, primepow, MPI( c ) );
         ASSERT( mpz_cmp_si( dummy, 1 ) == 0, "illegal inversion" );
+        mpz_clear(dummy);
+        #endif
         if ( mpz_cmp_si( b, 0 ) < 0 )
             mpz_add( b, b, primepow );
         mpz_mul( thempi, b, thempi );
         mpz_mod( thempi, thempi, primepow );
-        mpz_clear( dummy ); mpz_clear( a ); mpz_clear( b );
+        mpz_clear( a ); mpz_clear( b );
         return this;
     }
@@ -293 +307 @@
     }
     else {
-        mpz_t dummy, a, b;
-        mpz_init( dummy ); mpz_init( a ); mpz_init( b );
+        mpz_t a, b;
+        mpz_init( a ); mpz_init( b );
+        #ifdef SING_NDEBUG
+        mpz_gcdext( NULL, a, b, primepow, MPI( c ) );
+        #else
+        mpz_t dummy; mpz_init( dummy );
         mpz_gcdext( dummy, a, b, primepow, MPI( c ) );
         ASSERT( mpz_cmp_si( dummy, 1 ) == 0, "illegal inversion" );
-        mpz_clear( dummy ); mpz_clear( a );
+        mpz_clear( dummy );
+        #endif
+        mpz_clear( a );
         if ( mpz_cmp_si( b, 0 ) < 0 )
             mpz_add( b, b, primepow );