Use size_of_val
instead of manual calculation
#109287
+2
−2
Merged