use mul64_overflow

Author: MichaelChirico

src/integer64.c

@@ -366,10 +366,10 @@ SEXP power_integer64_integer64(SEXP e1_, SEXP e2_, SEXP ret_){
   long long * e1 = (long long *) REAL(e1_);
   long long * e2 = (long long *) REAL(e2_);
   long long * ret = (long long *) REAL(ret_);
-  long long base, exp, intermediate;
+  long long base, exp;
   Rboolean naflag = FALSE;
     mod_iterate(n1, n2, i1, i2) {
-        POW64(e1[i1],e2[i2],ret[i],naflag,base,exp,intermediate)
+        POW64(e1[i1],e2[i2],ret[i],naflag,base,exp)
     }
     if (naflag)warning(INTEGER64_OVERFLOW_WARNING);
   return ret_;

src/integer64.h

@@ -154,7 +154,7 @@ static inline bool mul64_overflow(long long a, long long b, long long *res) {
           ret = llroundl(longret); \
     }
 
-#define POW64(e1,e2,ret,naflag,base,exp,intermediate) \
+#define POW64(e1,e2,ret,naflag,base,exp) \
     if (e1 == NA_INTEGER64 || e2 == NA_INTEGER64) \
         ret = NA_INTEGER64; \
     else { \
@@ -164,9 +164,7 @@ static inline bool mul64_overflow(long long a, long long b, long long *res) {
             exp = e2; \
             while (exp > 0) { \
                 if (exp % 2 == 1) { \
-                    intermediate = ret; \
-                    ret *= base; \
-                    if (!GOODIPROD64(intermediate, base, ret)) { \
+                    if (mul64_overflow(ret, base, &ret)) { \
                         ret = NA_INTEGER64; \
                         naflag = TRUE; \
                         break; \