Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen

Conflicts:
 * build.zig
 * lib/std/array_list.zig
 * lib/std/c/ast.zig
 * lib/std/c/parse.zig
 * lib/std/os/bits/linux.zig

1 files changed, 18 insertions, 0 deletions

diff --git a/lib/std/math/isfinite.zig b/lib/std/math/isfinite.zig
index 5266b918df..11a352b042 100644
--- a/lib/std/math/isfinite.zig
+++ b/lib/std/math/isfinite.zig
@@ -24,6 +24,10 @@ pub fn isFinite(x: anytype) bool {
             const bits = @bitCast(u64, x);
             return bits & (maxInt(u64) >> 1) < (0x7FF << 52);
         },
+        f128 => {
+            const bits = @bitCast(u128, x);
+            return bits & (maxInt(u128) >> 1) < (0x7FFF << 112);
+        },
         else => {
             @compileError("isFinite not implemented for " ++ @typeName(T));
         },
@@ -37,10 +41,24 @@ test "math.isFinite" {
     expect(isFinite(@as(f32, -0.0)));
     expect(isFinite(@as(f64, 0.0)));
     expect(isFinite(@as(f64, -0.0)));
+    expect(isFinite(@as(f128, 0.0)));
+    expect(isFinite(@as(f128, -0.0)));
+
     expect(!isFinite(math.inf(f16)));
     expect(!isFinite(-math.inf(f16)));
     expect(!isFinite(math.inf(f32)));
     expect(!isFinite(-math.inf(f32)));
     expect(!isFinite(math.inf(f64)));
     expect(!isFinite(-math.inf(f64)));
+    expect(!isFinite(math.inf(f128)));
+    expect(!isFinite(-math.inf(f128)));
+
+    expect(!isFinite(math.nan(f16)));
+    expect(!isFinite(-math.nan(f16)));
+    expect(!isFinite(math.nan(f32)));
+    expect(!isFinite(-math.nan(f32)));
+    expect(!isFinite(math.nan(f64)));
+    expect(!isFinite(-math.nan(f64)));
+    expect(!isFinite(math.nan(f128)));
+    expect(!isFinite(-math.nan(f128)));
 }