From c04054ba55a94b009924883601b1a4696658d4db Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Thu, 2 Jan 2020 12:56:39 +0100
Subject: [PATCH] gac: generated code now use Int_ObjInt, not INT_INTOBJ

Fix a potential issue in gac where `INT_INTOBJ` was called on inputs without
validation; this could lead to unexpected behavior. We now use `Int_ObjInt`
instead, which raises an error if the input is not a small integer.
---
 src/c_oper1.c                       | 36 ++++++++++++++---------------
 src/c_type1.c                       | 34 +++++++++++++--------------
 src/compiler.c                      |  6 ++---
 src/hpc/c_oper1.c                   | 36 ++++++++++++++---------------
 src/hpc/c_type1.c                   | 34 +++++++++++++--------------
 tst/test-compile/basics.g.dynamic.c |  4 ++--
 tst/test-compile/basics.g.static.c  |  4 ++--
 7 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/src/c_oper1.c b/src/c_oper1.c
index f7169b0483a..8dce139d389 100644
--- a/src/c_oper1.c
+++ b/src/c_oper1.c
@@ -359,8 +359,8 @@ static Obj  HdlrFunc2 (
  }
  while ( 1 ) {
   if ( t_3 ) {
-   if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-   t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+   if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+   t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
    t_1 = (Obj)(((UInt)t_1)+4);
    if ( t_2 == 0 )  continue;
   }
@@ -409,8 +409,8 @@ static Obj  HdlrFunc2 (
    }
    while ( 1 ) {
     if ( t_7 ) {
-     if ( LEN_LIST(t_8) < INT_INTOBJ(t_5) )  break;
-     t_6 = ELMV0_LIST( t_8, INT_INTOBJ(t_5) );
+     if ( LEN_LIST(t_8) < Int_ObjInt(t_5) )  break;
+     t_6 = ELMV0_LIST( t_8, Int_ObjInt(t_5) );
      t_5 = (Obj)(((UInt)t_5)+4);
      if ( t_6 == 0 )  continue;
     }
@@ -866,8 +866,8 @@ static Obj  HdlrFunc3 (
   }
   while ( 1 ) {
    if ( t_3 ) {
-    if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-    t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+    if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+    t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
     t_1 = (Obj)(((UInt)t_1)+4);
     if ( t_2 == 0 )  continue;
    }
@@ -2142,8 +2142,8 @@ static Obj  HdlrFunc6 (
  }
  while ( 1 ) {
   if ( t_3 ) {
-   if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-   t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+   if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+   t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
    t_1 = (Obj)(((UInt)t_1)+4);
    if ( t_2 == 0 )  continue;
   }
@@ -2463,8 +2463,8 @@ static Obj  HdlrFunc6 (
   }
   while ( 1 ) {
    if ( t_3 ) {
-    if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-    t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+    if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+    t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
     t_1 = (Obj)(((UInt)t_1)+4);
     if ( t_2 == 0 )  continue;
    }
@@ -3320,8 +3320,8 @@ static Obj  HdlrFunc8 (
  }
  while ( 1 ) {
   if ( t_3 ) {
-   if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-   t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+   if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+   t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
    t_1 = (Obj)(((UInt)t_1)+4);
    if ( t_2 == 0 )  continue;
   }
@@ -3540,8 +3540,8 @@ static Obj  HdlrFunc7 (
   }
   while ( 1 ) {
    if ( t_3 ) {
-    if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-    t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+    if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+    t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
     t_1 = (Obj)(((UInt)t_1)+4);
     if ( t_2 == 0 )  continue;
    }
@@ -4820,8 +4820,8 @@ static Obj  HdlrFunc18 (
  }
  while ( 1 ) {
   if ( t_3 ) {
-   if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-   t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+   if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+   t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
    t_1 = (Obj)(((UInt)t_1)+4);
    if ( t_2 == 0 )  continue;
   }
@@ -5114,8 +5114,8 @@ static Obj  HdlrFunc17 (
  }
  while ( 1 ) {
   if ( t_3 ) {
-   if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-   t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+   if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+   t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
    t_1 = (Obj)(((UInt)t_1)+4);
    if ( t_2 == 0 )  continue;
   }
diff --git a/src/c_type1.c b/src/c_type1.c
index baf074699ab..dfcead07889 100644
--- a/src/c_type1.c
+++ b/src/c_type1.c
@@ -464,8 +464,8 @@ static Obj  HdlrFunc5 (
  }
  while ( 1 ) {
   if ( t_3 ) {
-   if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-   t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+   if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+   t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
    t_1 = (Obj)(((UInt)t_1)+4);
    if ( t_2 == 0 )  continue;
   }
@@ -915,7 +915,7 @@ static Obj  HdlrFunc7 (
       l_i = t_1;
       
       /* if IsBound( cached![i] ) then */
-      t_4 = IsbPosObj( l_cached, INT_INTOBJ(l_i) ) ? True : False;
+      t_4 = IsbPosObj( l_cached, Int_ObjInt(l_i) ) ? True : False;
       t_3 = (Obj)(UInt)(t_4 != False);
       if ( t_3 ) {
        
@@ -992,8 +992,8 @@ static Obj  HdlrFunc7 (
       l_i = t_1;
       
       /* if IsBound( parent![i] ) <> IsBound( cached![i] ) then */
-      t_4 = IsbPosObj( a_parent, INT_INTOBJ(l_i) ) ? True : False;
-      t_5 = IsbPosObj( l_cached, INT_INTOBJ(l_i) ) ? True : False;
+      t_4 = IsbPosObj( a_parent, Int_ObjInt(l_i) ) ? True : False;
+      t_5 = IsbPosObj( l_cached, Int_ObjInt(l_i) ) ? True : False;
       t_3 = (Obj)(UInt)( ! EQ( t_4, t_5 ));
       if ( t_3 ) {
        
@@ -1008,19 +1008,19 @@ static Obj  HdlrFunc7 (
       /* fi */
       
       /* if IsBound( parent![i] ) and IsBound( cached![i] ) and not IS_IDENTICAL_OBJ( parent![i], cached![i] ) then */
-      t_6 = IsbPosObj( a_parent, INT_INTOBJ(l_i) ) ? True : False;
+      t_6 = IsbPosObj( a_parent, Int_ObjInt(l_i) ) ? True : False;
       t_5 = (Obj)(UInt)(t_6 != False);
       t_4 = t_5;
       if ( t_4 ) {
-       t_7 = IsbPosObj( l_cached, INT_INTOBJ(l_i) ) ? True : False;
+       t_7 = IsbPosObj( l_cached, Int_ObjInt(l_i) ) ? True : False;
        t_6 = (Obj)(UInt)(t_7 != False);
        t_4 = t_6;
       }
       t_3 = t_4;
       if ( t_3 ) {
        t_8 = GF_IS__IDENTICAL__OBJ;
-       t_9 = ElmPosObj( a_parent, INT_INTOBJ(l_i) );
-       t_10 = ElmPosObj( l_cached, INT_INTOBJ(l_i) );
+       t_9 = ElmPosObj( a_parent, Int_ObjInt(l_i) );
+       t_10 = ElmPosObj( l_cached, Int_ObjInt(l_i) );
        if ( TNUM_OBJ( t_8 ) == T_FUNCTION ) {
         t_7 = CALL_2ARGS( t_8, t_9, t_10 );
        }
@@ -1179,7 +1179,7 @@ static Obj  HdlrFunc7 (
    l_i = t_1;
    
    /* if IsBound( parent![i] ) and not IsBound( type[i] ) then */
-   t_5 = IsbPosObj( a_parent, INT_INTOBJ(l_i) ) ? True : False;
+   t_5 = IsbPosObj( a_parent, Int_ObjInt(l_i) ) ? True : False;
    t_4 = (Obj)(UInt)(t_5 != False);
    t_3 = t_4;
    if ( t_3 ) {
@@ -1191,7 +1191,7 @@ static Obj  HdlrFunc7 (
    if ( t_3 ) {
     
     /* type[i] := parent![i]; */
-    t_3 = ElmPosObj( a_parent, INT_INTOBJ(l_i) );
+    t_3 = ElmPosObj( a_parent, Int_ObjInt(l_i) );
     C_ASS_LIST_FPL( l_type, l_i, t_3 )
     
    }
@@ -1244,8 +1244,8 @@ static Obj  HdlrFunc7 (
   }
   while ( 1 ) {
    if ( t_3 ) {
-    if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-    t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+    if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+    t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
     t_1 = (Obj)(((UInt)t_1)+4);
     if ( t_2 == 0 )  continue;
    }
@@ -2446,8 +2446,8 @@ static Obj  HdlrFunc20 (
   }
   while ( 1 ) {
    if ( t_3 ) {
-    if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-    t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+    if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+    t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
     t_1 = (Obj)(((UInt)t_1)+4);
     if ( t_2 == 0 )  continue;
    }
@@ -2746,8 +2746,8 @@ static Obj  HdlrFunc20 (
  }
  while ( 1 ) {
   if ( t_3 ) {
-   if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-   t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+   if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+   t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
    t_1 = (Obj)(((UInt)t_1)+4);
    if ( t_2 == 0 )  continue;
   }
diff --git a/src/compiler.c b/src/compiler.c
index 386024fe65f..be73ba28a72 100644
--- a/src/compiler.c
+++ b/src/compiler.c
@@ -720,13 +720,13 @@ static void Emit(const char * fmt, ...)
                     Pr("%d", INTG_CVAR(cvar), 0);
                 }
                 else if ( IS_TEMP_CVAR(cvar) ) {
-                    Pr("INT_INTOBJ(t_%d)", TEMP_CVAR(cvar), 0);
+                    Pr("Int_ObjInt(t_%d)", TEMP_CVAR(cvar), 0);
                 }
                 else if ( LVAR_CVAR(cvar) <= narg ) {
-                    Emit( "INT_INTOBJ(a_%n)", NAME_LVAR( LVAR_CVAR(cvar) ) );
+                    Emit( "Int_ObjInt(a_%n)", NAME_LVAR( LVAR_CVAR(cvar) ) );
                 }
                 else {
-                    Emit( "INT_INTOBJ(l_%n)", NAME_LVAR( LVAR_CVAR(cvar) ) );
+                    Emit( "Int_ObjInt(l_%n)", NAME_LVAR( LVAR_CVAR(cvar) ) );
                 }
             }
 
diff --git a/src/hpc/c_oper1.c b/src/hpc/c_oper1.c
index 645cdaa1a3e..79f741a93ed 100644
--- a/src/hpc/c_oper1.c
+++ b/src/hpc/c_oper1.c
@@ -375,8 +375,8 @@ static Obj  HdlrFunc2 (
  }
  while ( 1 ) {
   if ( t_3 ) {
-   if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-   t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+   if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+   t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
    t_1 = (Obj)(((UInt)t_1)+4);
    if ( t_2 == 0 )  continue;
   }
@@ -425,8 +425,8 @@ static Obj  HdlrFunc2 (
    }
    while ( 1 ) {
     if ( t_7 ) {
-     if ( LEN_LIST(t_8) < INT_INTOBJ(t_5) )  break;
-     t_6 = ELMV0_LIST( t_8, INT_INTOBJ(t_5) );
+     if ( LEN_LIST(t_8) < Int_ObjInt(t_5) )  break;
+     t_6 = ELMV0_LIST( t_8, Int_ObjInt(t_5) );
      t_5 = (Obj)(((UInt)t_5)+4);
      if ( t_6 == 0 )  continue;
     }
@@ -895,8 +895,8 @@ static Obj  HdlrFunc3 (
   }
   while ( 1 ) {
    if ( t_3 ) {
-    if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-    t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+    if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+    t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
     t_1 = (Obj)(((UInt)t_1)+4);
     if ( t_2 == 0 )  continue;
    }
@@ -2214,8 +2214,8 @@ static Obj  HdlrFunc6 (
  }
  while ( 1 ) {
   if ( t_3 ) {
-   if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-   t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+   if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+   t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
    t_1 = (Obj)(((UInt)t_1)+4);
    if ( t_2 == 0 )  continue;
   }
@@ -2535,8 +2535,8 @@ static Obj  HdlrFunc6 (
   }
   while ( 1 ) {
    if ( t_3 ) {
-    if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-    t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+    if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+    t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
     t_1 = (Obj)(((UInt)t_1)+4);
     if ( t_2 == 0 )  continue;
    }
@@ -3401,8 +3401,8 @@ static Obj  HdlrFunc8 (
  }
  while ( 1 ) {
   if ( t_3 ) {
-   if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-   t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+   if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+   t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
    t_1 = (Obj)(((UInt)t_1)+4);
    if ( t_2 == 0 )  continue;
   }
@@ -3634,8 +3634,8 @@ static Obj  HdlrFunc7 (
   }
   while ( 1 ) {
    if ( t_3 ) {
-    if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-    t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+    if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+    t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
     t_1 = (Obj)(((UInt)t_1)+4);
     if ( t_2 == 0 )  continue;
    }
@@ -4945,8 +4945,8 @@ static Obj  HdlrFunc18 (
  }
  while ( 1 ) {
   if ( t_3 ) {
-   if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-   t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+   if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+   t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
    t_1 = (Obj)(((UInt)t_1)+4);
    if ( t_2 == 0 )  continue;
   }
@@ -5239,8 +5239,8 @@ static Obj  HdlrFunc17 (
  }
  while ( 1 ) {
   if ( t_3 ) {
-   if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-   t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+   if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+   t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
    t_1 = (Obj)(((UInt)t_1)+4);
    if ( t_2 == 0 )  continue;
   }
diff --git a/src/hpc/c_type1.c b/src/hpc/c_type1.c
index b75428209cd..8ed9c0aa47b 100644
--- a/src/hpc/c_type1.c
+++ b/src/hpc/c_type1.c
@@ -516,8 +516,8 @@ static Obj  HdlrFunc5 (
  }
  while ( 1 ) {
   if ( t_3 ) {
-   if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-   t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+   if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+   t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
    t_1 = (Obj)(((UInt)t_1)+4);
    if ( t_2 == 0 )  continue;
   }
@@ -1036,7 +1036,7 @@ static Obj  HdlrFunc7 (
       l_i = t_1;
       
       /* if IsBound( cached![i] ) then */
-      t_4 = IsbPosObj( l_cached, INT_INTOBJ(l_i) ) ? True : False;
+      t_4 = IsbPosObj( l_cached, Int_ObjInt(l_i) ) ? True : False;
       t_3 = (Obj)(UInt)(t_4 != False);
       if ( t_3 ) {
        
@@ -1122,8 +1122,8 @@ static Obj  HdlrFunc7 (
       l_i = t_1;
       
       /* if IsBound( parent![i] ) <> IsBound( cached![i] ) then */
-      t_4 = IsbPosObj( a_parent, INT_INTOBJ(l_i) ) ? True : False;
-      t_5 = IsbPosObj( l_cached, INT_INTOBJ(l_i) ) ? True : False;
+      t_4 = IsbPosObj( a_parent, Int_ObjInt(l_i) ) ? True : False;
+      t_5 = IsbPosObj( l_cached, Int_ObjInt(l_i) ) ? True : False;
       t_3 = (Obj)(UInt)( ! EQ( t_4, t_5 ));
       if ( t_3 ) {
        
@@ -1138,19 +1138,19 @@ static Obj  HdlrFunc7 (
       /* fi */
       
       /* if IsBound( parent![i] ) and IsBound( cached![i] ) and not IS_IDENTICAL_OBJ( parent![i], cached![i] ) then */
-      t_6 = IsbPosObj( a_parent, INT_INTOBJ(l_i) ) ? True : False;
+      t_6 = IsbPosObj( a_parent, Int_ObjInt(l_i) ) ? True : False;
       t_5 = (Obj)(UInt)(t_6 != False);
       t_4 = t_5;
       if ( t_4 ) {
-       t_7 = IsbPosObj( l_cached, INT_INTOBJ(l_i) ) ? True : False;
+       t_7 = IsbPosObj( l_cached, Int_ObjInt(l_i) ) ? True : False;
        t_6 = (Obj)(UInt)(t_7 != False);
        t_4 = t_6;
       }
       t_3 = t_4;
       if ( t_3 ) {
        t_8 = GF_IS__IDENTICAL__OBJ;
-       t_9 = ElmPosObj( a_parent, INT_INTOBJ(l_i) );
-       t_10 = ElmPosObj( l_cached, INT_INTOBJ(l_i) );
+       t_9 = ElmPosObj( a_parent, Int_ObjInt(l_i) );
+       t_10 = ElmPosObj( l_cached, Int_ObjInt(l_i) );
        if ( TNUM_OBJ( t_8 ) == T_FUNCTION ) {
         t_7 = CALL_2ARGS( t_8, t_9, t_10 );
        }
@@ -1329,7 +1329,7 @@ static Obj  HdlrFunc7 (
    l_i = t_1;
    
    /* if IsBound( parent![i] ) and not IsBound( type[i] ) then */
-   t_5 = IsbPosObj( a_parent, INT_INTOBJ(l_i) ) ? True : False;
+   t_5 = IsbPosObj( a_parent, Int_ObjInt(l_i) ) ? True : False;
    t_4 = (Obj)(UInt)(t_5 != False);
    t_3 = t_4;
    if ( t_3 ) {
@@ -1341,7 +1341,7 @@ static Obj  HdlrFunc7 (
    if ( t_3 ) {
     
     /* type[i] := parent![i]; */
-    t_3 = ElmPosObj( a_parent, INT_INTOBJ(l_i) );
+    t_3 = ElmPosObj( a_parent, Int_ObjInt(l_i) );
     C_ASS_LIST_FPL( l_type, l_i, t_3 )
     
    }
@@ -1405,8 +1405,8 @@ static Obj  HdlrFunc7 (
   }
   while ( 1 ) {
    if ( t_3 ) {
-    if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-    t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+    if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+    t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
     t_1 = (Obj)(((UInt)t_1)+4);
     if ( t_2 == 0 )  continue;
    }
@@ -2834,8 +2834,8 @@ static Obj  HdlrFunc20 (
   }
   while ( 1 ) {
    if ( t_3 ) {
-    if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-    t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+    if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+    t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
     t_1 = (Obj)(((UInt)t_1)+4);
     if ( t_2 == 0 )  continue;
    }
@@ -3134,8 +3134,8 @@ static Obj  HdlrFunc20 (
  }
  while ( 1 ) {
   if ( t_3 ) {
-   if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) )  break;
-   t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
+   if ( LEN_LIST(t_4) < Int_ObjInt(t_1) )  break;
+   t_2 = ELMV0_LIST( t_4, Int_ObjInt(t_1) );
    t_1 = (Obj)(((UInt)t_1)+4);
    if ( t_2 == 0 )  continue;
   }
diff --git a/tst/test-compile/basics.g.dynamic.c b/tst/test-compile/basics.g.dynamic.c
index 7ba156db9a8..954c4a2fb27 100644
--- a/tst/test-compile/basics.g.dynamic.c
+++ b/tst/test-compile/basics.g.dynamic.c
@@ -1593,7 +1593,7 @@ static Obj  HdlrFunc9 (
  /* l![2 + 2] := 4; */
  C_SUM_INTOBJS( t_1, INTOBJ_INT(2), INTOBJ_INT(2) )
  CHECK_INT_SMALL_POS( t_1 );
- AssPosObj( l_l, INT_INTOBJ(t_1), INTOBJ_INT(4) );
+ AssPosObj( l_l, Int_ObjInt(t_1), INTOBJ_INT(4) );
  
  /* Display( l ); */
  t_1 = GF_Display;
@@ -1647,7 +1647,7 @@ static Obj  HdlrFunc9 (
  t_2 = MakeString( "l[4] = " );
  C_SUM_INTOBJS( t_4, INTOBJ_INT(2), INTOBJ_INT(2) )
  CHECK_INT_SMALL_POS( t_4 );
- t_3 = ElmPosObj( l_l, INT_INTOBJ(t_4) );
+ t_3 = ElmPosObj( l_l, Int_ObjInt(t_4) );
  t_4 = MakeString( "\n" );
  if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
   CALL_3ARGS( t_1, t_2, t_3, t_4 );
diff --git a/tst/test-compile/basics.g.static.c b/tst/test-compile/basics.g.static.c
index ad1c9cd972a..3c8dd0422ff 100644
--- a/tst/test-compile/basics.g.static.c
+++ b/tst/test-compile/basics.g.static.c
@@ -1593,7 +1593,7 @@ static Obj  HdlrFunc9 (
  /* l![2 + 2] := 4; */
  C_SUM_INTOBJS( t_1, INTOBJ_INT(2), INTOBJ_INT(2) )
  CHECK_INT_SMALL_POS( t_1 );
- AssPosObj( l_l, INT_INTOBJ(t_1), INTOBJ_INT(4) );
+ AssPosObj( l_l, Int_ObjInt(t_1), INTOBJ_INT(4) );
  
  /* Display( l ); */
  t_1 = GF_Display;
@@ -1647,7 +1647,7 @@ static Obj  HdlrFunc9 (
  t_2 = MakeString( "l[4] = " );
  C_SUM_INTOBJS( t_4, INTOBJ_INT(2), INTOBJ_INT(2) )
  CHECK_INT_SMALL_POS( t_4 );
- t_3 = ElmPosObj( l_l, INT_INTOBJ(t_4) );
+ t_3 = ElmPosObj( l_l, Int_ObjInt(t_4) );
  t_4 = MakeString( "\n" );
  if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
   CALL_3ARGS( t_1, t_2, t_3, t_4 );