Modified check that hasKnownInt is within integer range

Author: ceJce

lib/checktype.cpp

@@ -383,23 +383,18 @@ void CheckType::checkLongCast()
                     const ValueType *type = tok->astOperand1()->valueType();
                     if (type && checkTypeCombination(*type, *retVt, *mSettings) &&
                         type->pointer == 0U &&
-                        type->originalTypeName.empty() &&
-                        !tok->astOperand1()->hasKnownIntValue()) {
+                        type->originalTypeName.empty()) {
                         std::pair<MathLib::bigint, MathLib::bigint> opRange1, opRange2;
-                        if (!getExpressionResultRange(tok->astOperand1()->astOperand1(), *mSettings, opRange1) || !getExpressionResultRange(tok->astOperand1()->astOperand2(), *mSettings, opRange2)) {
+                        if (tok->astOperand1()->hasKnownIntValue()) {
+                            if (!mSettings->platform.isIntValue(tok->astOperand1()->getKnownIntValue()))
+                                ret = tok;
+                        } else if (!getExpressionResultRange(tok->astOperand1()->astOperand1(), *mSettings, opRange1) || !getExpressionResultRange(tok->astOperand1()->astOperand2(), *mSettings, opRange2)) {
                             ret = tok;
-                            break;
-                        }
-
-                        if (!mSettings->platform.isIntValue(opRange1.first) || !mSettings->platform.isIntValue(opRange1.second) ||
-                            !mSettings->platform.isIntValue(opRange2.first) || !mSettings->platform.isIntValue(opRange2.second)) {
+                        } else if (!mSettings->platform.isIntValue(opRange1.first) || !mSettings->platform.isIntValue(opRange1.second) ||
+                                   !mSettings->platform.isIntValue(opRange2.first) || !mSettings->platform.isIntValue(opRange2.second)) {
                             ret = tok;
-                            break;
-                        }
-
-                        if (!isOperationResultWithinIntRange(tok->astOperand1(), *mSettings, &opRange1, &opRange2)) {
+                        } else if (!isOperationResultWithinIntRange(tok->astOperand1(), *mSettings, &opRange1, &opRange2)) {
                             ret = tok;
-                            break;
                         }
                     }
                 }

test/testtype.cpp

@@ -477,6 +477,13 @@ class TestType : public TestFixture {
         check(code3b, dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:2:5]: (style) int result is returned as long value. If the return value is long to avoid loss of information, then you have loss of information. [truncLongCastReturn]\n", errout_str());
 
+        const char code3c[] = "long f() {\n"
+                              "    unsigned int n = 1U << 20;\n"
+                              "    return n << 20;\n"
+                              "}\n";
+        check(code3c, dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("[test.cpp:3:5]: (style) int result is returned as long value. If the return value is long to avoid loss of information, then you have loss of information. [truncLongCastReturn]\n", errout_str());
+
         const char code4a[] = "long f(int x) {\n"
                               "    int y = 0x07FFFF;\n"
                               "    return ((x & y) << (12 & x));\n"