Fix C4702 issues (unreachable code) in ANGLE, excluding <xtree>

build/common_defines.gypi

@@ -19,7 +19,9 @@
         4244, # Conversion from 'type1' to 'type2', possible loss of data
         4267, # Conversion from 'size_t' to 'type', possible loss of data
 
-        4702, # Unreachable code. Useful, but fires on system header xtree.
+        # TODO: 4702 doesn't fire on xtree in VS2015 (CTP6). We can remove C4702 after moving to VS2015.
+        4702, # Unreachable code. Should only fire on system header xtree.
+        
         4718, # Recursive call has no side effects. Fires on xtree too.
     ],
     'msvs_system_include_dirs':

src/compiler/preprocessor/ExpressionParser.cpp

@@ -86,7 +86,7 @@
 #pragma GCC diagnostic ignored "-Wuninitialized"
 #endif
 #elif defined(_MSC_VER)
-#pragma warning(disable: 4065 4701)
+#pragma warning(disable: 4065 4701 4702)
 #endif
 
 #include "ExpressionParser.h"

src/compiler/preprocessor/ExpressionParser.y

@@ -28,7 +28,7 @@ WHICH GENERATES THE GLSL ES preprocessor expression parser.
 #pragma GCC diagnostic ignored "-Wuninitialized"
 #endif
 #elif defined(_MSC_VER)
-#pragma warning(disable: 4065 4701)
+#pragma warning(disable: 4065 4701 4702)
 #endif
 
 #include "ExpressionParser.h"

src/compiler/translator/glslang.l

@@ -32,6 +32,7 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp).
 #pragma warning(disable: 4189)
 #pragma warning(disable: 4505)
 #pragma warning(disable: 4701)
+#pragma warning(disable: 4702)
 #endif
 }
 

src/compiler/translator/glslang.y

@@ -32,6 +32,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
 #pragma warning(disable: 4189)
 #pragma warning(disable: 4505)
 #pragma warning(disable: 4701)
+#pragma warning(disable: 4702)
 #endif
 
 #include "angle_gl.h"

src/compiler/translator/glslang_lex.cpp

@@ -17,6 +17,7 @@
 #pragma warning(disable: 4189)
 #pragma warning(disable: 4505)
 #pragma warning(disable: 4701)
+#pragma warning(disable: 4702)
 #endif
 
 

src/compiler/translator/glslang_tab.cpp

@@ -82,6 +82,7 @@
 #pragma warning(disable: 4189)
 #pragma warning(disable: 4505)
 #pragma warning(disable: 4701)
+#pragma warning(disable: 4702)
 #endif
 
 #include "angle_gl.h"

src/tests/end2end_tests/UnpackAlignmentTest.cpp

@@ -81,7 +81,7 @@ protected:
                   case GL_LUMINANCE_ALPHA: compCount = 2; break;
                   case GL_LUMINANCE:       compCount = 1; break;
                   case GL_ALPHA:           compCount = 1; break;
-                  FAIL() << "unknown pixel format.";
+                  default:                 FAIL() << "unknown pixel format.";
                 }
                 *size = sizeof(GLubyte) * compCount;
             }