diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2017-09-13 02:42:00 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2017-09-13 02:42:00 -0400 |
| commit | 5931a6b1a5b8f4941fc9b78f8960745f81594f17 (patch) | |
| tree | 0a9897aab096767288688216aa68d3809e2d77fe /src/ir.cpp | |
| parent | 373785ae8d49d0ae3785020f05573763268ee9e1 (diff) | |
| parent | 57ea6e8c9f204be6d38177024d3b8f1aba4e05b2 (diff) | |
| download | zig-5931a6b1a5b8f4941fc9b78f8960745f81594f17.tar.gz zig-5931a6b1a5b8f4941fc9b78f8960745f81594f17.zip | |
Merge branch 'msvc'
Now the supported compilers of Zig are:
* GCC
* Clang
* MSVC
* MinGW
Diffstat (limited to 'src/ir.cpp')
| -rw-r--r-- | src/ir.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ir.cpp b/src/ir.cpp index 73f7b1df1e..a06fc261c4 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -6500,9 +6500,9 @@ static void float_init_bigint(BigInt *bigint, ConstExprValue *const_val) { break; case 128: if (const_val->data.x_f128 >= 0) { - bigint_init_u128(bigint, (unsigned __int128)(const_val->data.x_f128)); + bigint_init_u128(bigint, (uint128_t)(const_val->data.x_f128)); } else { - bigint_init_u128(bigint, (unsigned __int128)(-const_val->data.x_f128)); + bigint_init_u128(bigint, (uint128_t)(-const_val->data.x_f128)); bigint->is_negative = true; } break; @@ -9731,8 +9731,7 @@ static TypeTableEntry *ir_analyze_array_mult(IrAnalyze *ira, IrInstructionBinOp uint64_t old_array_len = array_type->data.array.len; uint64_t new_array_len; - if (__builtin_umulll_overflow((unsigned long long)old_array_len, (unsigned long long)mult_amt, - (unsigned long long*)&new_array_len)) + if (mul_u64_overflow(old_array_len, mult_amt, &new_array_len)) { ir_add_error(ira, &instruction->base, buf_sprintf("operation results in overflow")); return ira->codegen->builtin_types.entry_invalid; |