Fix an issue with handling an error case inside ValidateSwitch

In case a condition with a wrong type is given to a case statement, it generates an error but the compiler recovers. This caused ValidateSwitch to assert. Fix this. BUG=angle:921 Change-Id: I7949798cab923c2b168817471896470c6c611878 Reviewed-on: https://chromium-review.googlesource.com/254080Reviewed-by: Zhenyao Mo <zmo@chromium.org> Tested-by: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Fix an issue with handling an error case inside ValidateSwitch
c8716df9 · Olli Etuaho · eea095e1 · c8716df9
Commit c8716df9 authored Feb 26, 2015 by Olli Etuaho
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

ValidateSwitch.cpp src/compiler/translator/ValidateSwitch.cpp +3 -3

No files found.
--- a/src/compiler/translator/ValidateSwitch.cpp
+++ b/src/compiler/translator/ValidateSwitch.cpp
@@ -131,9 +131,8 @@ bool ValidateSwitch::visitCase(Visit, TIntermCase *node)
                mCasesSigned.insert(iConst);
            }
        }
-        else
+        else if (conditionType == EbtUInt)
        {
-            ASSERT(conditionType == EbtUInt);
            unsigned int uConst = condition->getUConst(0);
            if (mCasesUnsigned.find(uConst) != mCasesUnsigned.end())
            {
@@ -144,8 +143,9 @@ bool ValidateSwitch::visitCase(Visit, TIntermCase *node)
            {
                mCasesUnsigned.insert(uConst);
            }
-
        }
+        // Other types are possible only in error cases, where the error has already been generated
+        // when parsing the case statement.
    }
    // Don't traverse the condition of the case statement
    return false;