Skip to content

Commit d04f3cd

Browse files
committed
fix some double promotion warnings
1 parent 986d017 commit d04f3cd

7 files changed

Lines changed: 19 additions & 13 deletions

File tree

core/iwasm/aot/aot_intrinsic.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ float64
152152
aot_intrinsic_fmin_f64(float64 a, float64 b)
153153
{
154154
if (isnan(a) || isnan(b))
155-
return NAN;
155+
return (float64)NAN;
156156
else if (a == 0 && a == b)
157157
return signbit(a) ? a : b;
158158
else
@@ -174,7 +174,7 @@ float64
174174
aot_intrinsic_fmax_f64(float64 a, float64 b)
175175
{
176176
if (isnan(a) || isnan(b))
177-
return NAN;
177+
return (float64)NAN;
178178
else if (a == 0 && a == b)
179179
return signbit(a) ? b : a;
180180
else

core/iwasm/compilation/aot_compiler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ set_local_gc_ref(AOTCompFrame *frame, int n, LLVMValueRef value, uint8 ref_type)
668668

669669
#define I32_CONST(v) LLVMConstInt(I32_TYPE, v, true)
670670
#define I64_CONST(v) LLVMConstInt(I64_TYPE, v, true)
671-
#define F32_CONST(v) LLVMConstReal(F32_TYPE, v)
671+
#define F32_CONST(v) LLVMConstReal(F32_TYPE, (double)(v))
672672
#define F64_CONST(v) LLVMConstReal(F64_TYPE, v)
673673
#define I8_CONST(v) LLVMConstInt(INT8_TYPE, v, true)
674674

core/iwasm/compilation/simd/simd_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ simd_build_splat_const_float_vector(const AOTCompContext *comp_ctx,
137137
return NULL;
138138
}
139139

140-
if (!(element = LLVMConstReal(element_type, element_value))) {
140+
if (!(element = LLVMConstReal(element_type, (double)element_value))) {
141141
HANDLE_FAILURE("LLVMConstReal");
142142
goto fail;
143143
}

core/iwasm/fast-jit/fe/jit_emit_numberic.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,7 @@ static float64
15641564
f64_min(float64 a, float64 b)
15651565
{
15661566
if (isnan(a) || isnan(b))
1567-
return NAN;
1567+
return (float64)NAN;
15681568
else if (a == 0 && a == b)
15691569
return signbit(a) ? a : b;
15701570
else
@@ -1575,7 +1575,7 @@ static float64
15751575
f64_max(float64 a, float64 b)
15761576
{
15771577
if (isnan(a) || isnan(b))
1578-
return NAN;
1578+
return (float64)NAN;
15791579
else if (a == 0 && a == b)
15801580
return signbit(a) ? b : a;
15811581
else

core/iwasm/fast-jit/jit_dump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jit_dump_reg(JitCompContext *cc, JitReg reg)
4040

4141
case JIT_REG_KIND_F32:
4242
if (jit_reg_is_const(reg))
43-
os_printf("%f", jit_cc_get_const_F32(cc, reg));
43+
os_printf("%f", (double)jit_cc_get_const_F32(cc, reg));
4444
else
4545
os_printf("f%d", no);
4646
break;

core/iwasm/interpreter/wasm_interp_classic.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ static inline float64
223223
f64_min(float64 a, float64 b)
224224
{
225225
if (isnan(a) || isnan(b))
226-
return NAN;
226+
return (float64)NAN;
227227
else if (a == 0 && a == b)
228228
return signbit(a) ? a : b;
229229
else
@@ -234,7 +234,7 @@ static inline float64
234234
f64_max(float64 a, float64 b)
235235
{
236236
if (isnan(a) || isnan(b))
237-
return NAN;
237+
return (float64)NAN;
238238
else if (a == 0 && a == b)
239239
return signbit(a) ? b : a;
240240
else
@@ -1685,7 +1685,10 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
16851685
goto got_exception;
16861686
}
16871687

1688-
HANDLE_OP(WASM_OP_NOP) { HANDLE_OP_END(); }
1688+
HANDLE_OP(WASM_OP_NOP)
1689+
{
1690+
HANDLE_OP_END();
1691+
}
16891692

16901693
#if WASM_ENABLE_EXCE_HANDLING != 0
16911694
HANDLE_OP(WASM_OP_RETHROW)
@@ -5622,7 +5625,10 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
56225625
HANDLE_OP(WASM_OP_I32_REINTERPRET_F32)
56235626
HANDLE_OP(WASM_OP_I64_REINTERPRET_F64)
56245627
HANDLE_OP(WASM_OP_F32_REINTERPRET_I32)
5625-
HANDLE_OP(WASM_OP_F64_REINTERPRET_I64) { HANDLE_OP_END(); }
5628+
HANDLE_OP(WASM_OP_F64_REINTERPRET_I64)
5629+
{
5630+
HANDLE_OP_END();
5631+
}
56265632

56275633
HANDLE_OP(WASM_OP_I32_EXTEND8_S)
56285634
{

core/iwasm/interpreter/wasm_interp_fast.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ static inline float64
164164
f64_min(float64 a, float64 b)
165165
{
166166
if (isnan(a) || isnan(b))
167-
return NAN;
167+
return (float64)NAN;
168168
else if (a == 0 && a == b)
169169
return signbit(a) ? a : b;
170170
else
@@ -175,7 +175,7 @@ static inline float64
175175
f64_max(float64 a, float64 b)
176176
{
177177
if (isnan(a) || isnan(b))
178-
return NAN;
178+
return (float64)NAN;
179179
else if (a == 0 && a == b)
180180
return signbit(a) ? b : a;
181181
else

0 commit comments

Comments
 (0)