delegator size padding

Author: nuevoalex

source/contracts/libraries/Delegator.sol

@@ -24,13 +24,7 @@ contract Delegator is DelegationTarget {
             //0x40 is the address where the next free memory slot is stored in Solidity
             let _calldataMemoryOffset := mload(0x40)
             // Update the pointer at 0x40 to point at new free memory location so any theoretical allocation doesn't stomp our memory in this call
-            let _size := 0
-            switch gt(calldatasize, 32)
-            case 1 {
-                _size := calldatasize
-            } default {
-                _size := 32
-            }
+            let _size := and(add(calldatasize, 0x1f), not(0x1f))
             mstore(0x40, add(_calldataMemoryOffset, _size))
             // Copy method signature and parameters of this call into memory
             calldatacopy(_calldataMemoryOffset, 0x0, calldatasize)