From e916d671d994ee3209b7a170ff7c83597307e612 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Thu, 1 Dec 2016 11:26:08 +0900 Subject: [PATCH] Add parentheses aroung logical operations (dotnet/coreclr#8406) This commit fixes logical-op-parentheses compile error for x86/Linux build. Commit migrated from https://github.com/dotnet/coreclr/commit/4e17522078fd30bcc4e83a43c03a673a1f98eee1 --- src/coreclr/src/vm/excep.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/src/vm/excep.cpp b/src/coreclr/src/vm/excep.cpp index 68eafba65093e..c161c477853c5 100644 --- a/src/coreclr/src/vm/excep.cpp +++ b/src/coreclr/src/vm/excep.cpp @@ -7313,8 +7313,8 @@ AdjustContextForWriteBarrier( void* f_IP = (void *)GetIP(pContext); - if (f_IP >= (void *) JIT_WriteBarrierStart && f_IP <= (void *) JIT_WriteBarrierLast || - f_IP >= (void *) JIT_PatchedWriteBarrierStart && f_IP <= (void *) JIT_PatchedWriteBarrierLast) + if (((f_IP >= (void *) JIT_WriteBarrierStart) && (f_IP <= (void *) JIT_WriteBarrierLast)) || + ((f_IP >= (void *) JIT_PatchedWriteBarrierStart) && (f_IP <= (void *) JIT_PatchedWriteBarrierLast))) { // set the exception IP to be the instruction that called the write barrier void* callsite = (void *)GetAdjustedCallAddress(*dac_cast(GetSP(pContext)));