diff --git a/src/coreclr/jit/codegenarm.cpp b/src/coreclr/jit/codegenarm.cpp index c9dd49197e1106..de1ade4ad10b4e 100644 --- a/src/coreclr/jit/codegenarm.cpp +++ b/src/coreclr/jit/codegenarm.cpp @@ -715,10 +715,13 @@ instruction CodeGen::genGetInsForOper(genTreeOps oper, var_types type) case GT_MUL: ins = INS_MUL; break; -#if !defined(USE_HELPERS_FOR_INT_DIV) +#if !USE_HELPERS_FOR_INT_DIV case GT_DIV: ins = INS_sdiv; break; + case GT_UDIV: + ins = INS_udiv; + break; #endif // !USE_HELPERS_FOR_INT_DIV case GT_LSH: ins = INS_SHIFT_LEFT_LOGICAL; @@ -1066,7 +1069,7 @@ void CodeGen::genCodeForDivMod(GenTreeOp* tree) // on float/double args. noway_assert(tree->OperIs(GT_DIV) || !varTypeIsFloating(tree)); -#if defined(USE_HELPERS_FOR_INT_DIV) +#if USE_HELPERS_FOR_INT_DIV noway_assert(!varTypeIsIntOrI(tree)); #endif // USE_HELPERS_FOR_INT_DIV diff --git a/src/coreclr/jit/emitarm.cpp b/src/coreclr/jit/emitarm.cpp index f0696f010d3331..b1d1e27270f54f 100644 --- a/src/coreclr/jit/emitarm.cpp +++ b/src/coreclr/jit/emitarm.cpp @@ -3208,7 +3208,7 @@ void emitter::emitIns_R_R_R(instruction ins, } } -#if !defined(USE_HELPERS_FOR_INT_DIV) +#if !USE_HELPERS_FOR_INT_DIV FALLTHROUGH; case INS_sdiv: case INS_udiv: diff --git a/src/coreclr/jit/lower.cpp b/src/coreclr/jit/lower.cpp index b122b8de775259..cf39d54f195c61 100644 --- a/src/coreclr/jit/lower.cpp +++ b/src/coreclr/jit/lower.cpp @@ -8086,7 +8086,7 @@ bool Lowering::TryLowerConstIntUDivOrUMod(GenTreeOp* divMod) { assert(divMod->OperIs(GT_UDIV, GT_UMOD)); -#if defined(USE_HELPERS_FOR_INT_DIV) +#if USE_HELPERS_FOR_INT_DIV if (!varTypeIsIntegral(divMod->TypeGet())) { assert(!"unreachable: integral GT_UDIV/GT_UMOD should get morphed into helper calls"); @@ -8403,7 +8403,7 @@ bool Lowering::TryLowerConstIntDivOrMod(GenTree* node, GenTree** nextNode) const var_types type = divMod->TypeGet(); assert((type == TYP_INT) || (type == TYP_LONG)); -#if defined(USE_HELPERS_FOR_INT_DIV) +#if USE_HELPERS_FOR_INT_DIV assert(!"unreachable: integral GT_DIV/GT_MOD should get morphed into helper calls"); #endif // USE_HELPERS_FOR_INT_DIV #if defined(TARGET_ARM64) diff --git a/src/coreclr/jit/morph.cpp b/src/coreclr/jit/morph.cpp index c8bc3675fdbb69..c12cd5b6b97b45 100644 --- a/src/coreclr/jit/morph.cpp +++ b/src/coreclr/jit/morph.cpp @@ -7378,7 +7378,7 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, bool* optAssertionPropDone) goto USE_HELPER_FOR_ARITH; } -#if USE_HELPERS_FOR_INT_DIV +#ifdef TARGET_ARM if (typ == TYP_INT) { if (oper == GT_UMOD) @@ -7392,7 +7392,7 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, bool* optAssertionPropDone) goto USE_HELPER_FOR_ARITH; } } -#endif +#endif // TARGET_ARM #endif // !defined(TARGET_64BIT) && !defined(TARGET_WASM) if (tree->OperIs(GT_UMOD) && op2->IsIntegralConstUnsignedPow2())