Change to initializing the variable
authorRyan Harrison <rharrison@google.com>
Wed, 28 Aug 2019 17:15:15 +0000 (13:15 -0400)
committerRyan Harrison <rharrison@google.com>
Wed, 28 Aug 2019 17:15:15 +0000 (13:15 -0400)
glslang/MachineIndependent/ParseHelper.cpp

index 20c2c8e..bb6ab24 100644 (file)
@@ -7077,11 +7077,11 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
             }
             node = intermediate.setAggregateOperator(node, EOpConstructCooperativeMatrix, type, node->getLoc());
         } else {
-            TOperator op;
+            TOperator op = EOpNull;
             switch (type.getBasicType()) {
             default:
                 assert(0);
-                return nullptr;
+                break;
             case EbtInt:
             {
                 switch (node->getType().getBasicType()) {
@@ -7090,9 +7090,7 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
                     case EbtUint8:   op = EOpConvUint8ToInt;    break;
                     case EbtInt8:    op = EOpConvInt8ToInt;     break;
                     case EbtUint:    op = EOpConvUintToInt;     break;
-                    default:
-                        assert(0);
-                        return nullptr;
+                    default: assert(0);
                 }
 
             }
@@ -7106,9 +7104,7 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
                     case EbtInt8:    op = EOpConvInt8ToUint;    break;
                     case EbtInt:     op = EOpConvIntToUint;      break;
                     case EbtUint:    op = EOpConvUintToInt8;     break;
-                    default:
-                        assert(0);
-                        return nullptr;
+                    default: assert(0);
                 }
 
             }
@@ -7122,9 +7118,7 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
                     case EbtUint8:   op = EOpConvUint8ToInt8;    break;
                     case EbtInt:     op = EOpConvIntToInt8;      break;
                     case EbtUint:    op = EOpConvUintToInt8;     break;
-                    default:
-                        assert(0);
-                        return nullptr;
+                    default: assert(0);
                 }
 
             }
@@ -7136,9 +7130,7 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
                     case EbtInt8:    op = EOpConvInt8ToUint8;    break;
                     case EbtInt:     op = EOpConvIntToUint8;     break;
                     case EbtUint:    op = EOpConvUintToUint8;    break;
-                    default:
-                        assert(0);
-                        return nullptr;
+                    default: assert(0);
                 }
             }
                 break;
@@ -7150,9 +7142,7 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
                     case EbtUint8:   op = EOpConvUint8ToFloat;    break;
                     case EbtInt:     op = EOpConvIntToFloat;      break;
                     case EbtUint:    op = EOpConvUintToFloat;     break;
-                    default:
-                        assert(0);
-                        return nullptr;
+                    default: assert(0);
                 }
             }
                 break;
@@ -7164,9 +7154,7 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
                     case EbtUint8:  op = EOpConvUint8ToFloat16;  break;
                     case EbtInt:    op = EOpConvIntToFloat16;    break;
                     case EbtUint:   op = EOpConvUintToFloat16;   break;
-                    default:
-                        assert(0);
-                        return nullptr;
+                    default: assert(0);
                 }
             }
                 break;