CLJCLR-101: part 3: Fix calc of ulong +/* before checking for overflow

dmiller · dmiller · commit cd13d29650e2 · 2019-02-25T21:35:18.000-06:00
diff --git a/Clojure/Clojure/Lib/Numbers.cs b/Clojure/Clojure/Lib/Numbers.cs
@@ -3377,19 +3377,17 @@ public static object num(ulong x)
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "add")]
         public static ulong add(ulong x, ulong y)
         {
-            ulong ret = x + y;
             if ( x > UInt64.MaxValue - y)
                 throw new ArithmeticException("integer overflow");
-            return ret;
+            return x + y;;
         }
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "add")]
         public static object addP(ulong x, ulong y)
         {
-            ulong ret = x + y;
             if (x > UInt64.MaxValue - y)
                 return addP((object)x, (object)y);
-            return num(ret);
+            return num(x + y);
         }
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "minus")]

Original file line number	Diff line number	Diff line change
`@@ -3377,19 +3377,17 @@ public static object num(ulong x)`
`3377`	`3377`	`[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "add")]`
`3378`	`3378`	`public static ulong add(ulong x, ulong y)`
`3379`	`3379`	`{`
`3380`		`- ulong ret = x + y;`
`3381`	`3380`	`if ( x > UInt64.MaxValue - y)`
`3382`	`3381`	`throw new ArithmeticException("integer overflow");`
`3383`		`- return ret;`
	`3382`	`+ return x + y;;`
`3384`	`3383`	`}`
`3385`	`3384`
`3386`	`3385`	`[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "add")]`
`3387`	`3386`	`public static object addP(ulong x, ulong y)`
`3388`	`3387`	`{`
`3389`		`- ulong ret = x + y;`
`3390`	`3388`	`if (x > UInt64.MaxValue - y)`
`3391`	`3389`	`return addP((object)x, (object)y);`
`3392`		`- return num(ret);`
	`3390`	`+ return num(x + y);`
`3393`	`3391`	`}`
`3394`	`3392`
`3395`	`3393`	`[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "minus")]`