From b0dfb1aef2cd5483f59b858c8921707174ffdf2d Mon Sep 17 00:00:00 2001 From: Yong He Date: Tue, 10 Dec 2024 03:49:25 -0800 Subject: Don't emit a warning when implicit casting from known in-range int lit to half. (#5814) Co-authored-by: Ellie Hermaszewska --- source/slang/slang-check-conversion.cpp | 2 +- source/slang/slang-check-decl.cpp | 12 ++++++++++++ source/slang/slang-check-impl.h | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/slang/slang-check-conversion.cpp b/source/slang/slang-check-conversion.cpp index 0c06fb113..74151a4bb 100644 --- a/source/slang/slang-check-conversion.cpp +++ b/source/slang/slang-check-conversion.cpp @@ -1327,7 +1327,7 @@ bool SemanticsVisitor::_coerce( // For general types of implicit conversions, we issue a warning, unless `fromExpr` // is a known constant and we know it won't cause a problem. bool shouldEmitGeneralWarning = true; - if (isScalarIntegerType(toType)) + if (isScalarIntegerType(toType) || isHalfType(toType)) { if (auto intVal = tryFoldIntegerConstantExpression( fromExpr, diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp index eeb75e3fd..a666d9df3 100644 --- a/source/slang/slang-check-decl.cpp +++ b/source/slang/slang-check-decl.cpp @@ -7421,6 +7421,15 @@ bool SemanticsVisitor::isScalarIntegerType(Type* type) return isIntegerBaseType(baseType) || baseType == BaseType::Bool; } +bool SemanticsVisitor::isHalfType(Type* type) +{ + auto basicType = as(type); + if (!basicType) + return false; + auto baseType = basicType->getBaseType(); + return baseType == BaseType::Half; +} + bool SemanticsVisitor::isValidCompileTimeConstantType(Type* type) { return isScalarIntegerType(type) || isEnumType(type); @@ -7466,6 +7475,9 @@ bool SemanticsVisitor::isIntValueInRangeOfType(IntegerLiteralValue value, Type* #endif return value >= std::numeric_limits::min() && value <= std::numeric_limits::max(); + + case BaseType::Half: + return value >= -2048 && value <= 2048; default: return false; } diff --git a/source/slang/slang-check-impl.h b/source/slang/slang-check-impl.h index 460e87cb9..0dfa75631 100644 --- a/source/slang/slang-check-impl.h +++ b/source/slang/slang-check-impl.h @@ -1967,6 +1967,9 @@ public: /// Is `type` a scalar integer type. bool isScalarIntegerType(Type* type); + /// Is `type` a scalar half type. + bool isHalfType(Type* type); + /// Is `type` something we allow as compile time constants, i.e. scalar integer and enum types. bool isValidCompileTimeConstantType(Type* type); -- cgit v1.2.3