commit 69bc6e8ac26d38aec85946dbf1bc60c32fb6e5d3
author Tom Anderson <thomasanderson@google.com> Mon Mar 20 11:54:29 2017 -0700
committer Tom Anderson <thomasanderson@google.com> Mon Mar 20 21:10:04 2017 +0000
tree 41797d9d31f60b58f4ba52b2deea95e1fc3c2f4c
parent 3eabac0a931ed6e31d1a043860caf336fecf09aa

Fix GCC build

This CL fixes building the 'all' target in a Chromium checkout with the following args.gn:
is_debug = false
is_clang = false
use_sysroot = false
proprietary_codecs = true
ffmpeg_branding = "Chrome"
is_component_build = true
enable_nacl = false
use_goma = true

Bug chromium:697528
Change-Id: Ie725988e8a1cb9ee672eb1e8e20d718ac91004fa

Change-Id: Ie725988e8a1cb9ee672eb1e8e20d718ac91004fa
Reviewed-on: https://swiftshader-review.googlesource.com/8888
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Tom Anderson <thomasanderson@google.com>

src/Reactor/LLVMReactor.cpp

diff --git a/src/Reactor/LLVMReactor.cpp b/src/Reactor/LLVMReactor.cpp
index 0d56858..1e8a75a 100644
--- a/src/Reactor/LLVMReactor.cpp
+++ b/src/Reactor/LLVMReactor.cpp
@@ -5218,7 +5218,7 @@
 		else
 		{
 			RValue<Int4> greater = CmpNLE(x, y);
-			return x & greater | y & ~greater;
+			return (x & greater) | (y & ~greater);
 		}
 	}
 
@@ -5231,7 +5231,7 @@
 		else
 		{
 			RValue<Int4> less = CmpLT(x, y);
-			return x & less | y & ~less;
+			return (x & less) | (y & ~less);
 		}
 	}
 
@@ -5558,7 +5558,7 @@
 		else
 		{
 			RValue<UInt4> greater = CmpNLE(x, y);
-			return x & greater | y & ~greater;
+			return (x & greater) | (y & ~greater);
 		}
 	}
 
@@ -5571,7 +5571,7 @@
 		else
 		{
 			RValue<UInt4> less = CmpLT(x, y);
-			return x & less | y & ~less;
+			return (x & less) | (y & ~less);
 		}
 	}