diff --git a/truffle/src/com.oracle.truffle.nfi.native/src/signature.c b/truffle/src/com.oracle.truffle.nfi.native/src/signature.c
index d2f158a72da2..7beadc82570d 100644
--- a/truffle/src/com.oracle.truffle.nfi.native/src/signature.c
+++ b/truffle/src/com.oracle.truffle.nfi.native/src/signature.c
@@ -56,10 +56,8 @@ struct cif_data {
 };
 
 static int align_up(int index, int alignment) {
-    if (index % alignment != 0) {
-        index += alignment - (index % alignment);
-    }
-    return index;
+    int mask = alignment - 1;
+    return (index + mask) & ~mask;
 }
 
 __thread struct __TruffleEnvInternal *cachedTruffleEnv = NULL;