diff --git a/compiler-rt/lib/asan/asan_rtl.cpp b/compiler-rt/lib/asan/asan_rtl.cpp
--- a/compiler-rt/lib/asan/asan_rtl.cpp
+++ b/compiler-rt/lib/asan/asan_rtl.cpp
@@ -187,7 +187,7 @@
 extern "C"
 NOINLINE INTERFACE_ATTRIBUTE
 void __asan_loadN(uptr addr, uptr size) {
-  if (__asan_region_is_poisoned(addr, size)) {
+  if ((addr = __asan_region_is_poisoned(addr, size))) {
     GET_CALLER_PC_BP_SP;
     ReportGenericError(pc, bp, sp, addr, false, size, 0, true);
   }
@@ -196,7 +196,7 @@
 extern "C"
 NOINLINE INTERFACE_ATTRIBUTE
 void __asan_exp_loadN(uptr addr, uptr size, u32 exp) {
-  if (__asan_region_is_poisoned(addr, size)) {
+  if ((addr = __asan_region_is_poisoned(addr, size))) {
     GET_CALLER_PC_BP_SP;
     ReportGenericError(pc, bp, sp, addr, false, size, exp, true);
   }
@@ -205,7 +205,7 @@
 extern "C"
 NOINLINE INTERFACE_ATTRIBUTE
 void __asan_loadN_noabort(uptr addr, uptr size) {
-  if (__asan_region_is_poisoned(addr, size)) {
+  if ((addr = __asan_region_is_poisoned(addr, size))) {
     GET_CALLER_PC_BP_SP;
     ReportGenericError(pc, bp, sp, addr, false, size, 0, false);
   }
@@ -214,7 +214,7 @@
 extern "C"
 NOINLINE INTERFACE_ATTRIBUTE
 void __asan_storeN(uptr addr, uptr size) {
-  if (__asan_region_is_poisoned(addr, size)) {
+  if ((addr = __asan_region_is_poisoned(addr, size))) {
     GET_CALLER_PC_BP_SP;
     ReportGenericError(pc, bp, sp, addr, true, size, 0, true);
   }
@@ -223,7 +223,7 @@
 extern "C"
 NOINLINE INTERFACE_ATTRIBUTE
 void __asan_exp_storeN(uptr addr, uptr size, u32 exp) {
-  if (__asan_region_is_poisoned(addr, size)) {
+  if ((addr = __asan_region_is_poisoned(addr, size))) {
     GET_CALLER_PC_BP_SP;
     ReportGenericError(pc, bp, sp, addr, true, size, exp, true);
   }
@@ -232,7 +232,7 @@
 extern "C"
 NOINLINE INTERFACE_ATTRIBUTE
 void __asan_storeN_noabort(uptr addr, uptr size) {
-  if (__asan_region_is_poisoned(addr, size)) {
+  if ((addr = __asan_region_is_poisoned(addr, size))) {
     GET_CALLER_PC_BP_SP;
     ReportGenericError(pc, bp, sp, addr, true, size, 0, false);
   }
diff --git a/compiler-rt/test/asan/TestCases/load_and_store_n.cpp b/compiler-rt/test/asan/TestCases/load_and_store_n.cpp
new file mode 100644
--- /dev/null
+++ b/compiler-rt/test/asan/TestCases/load_and_store_n.cpp
@@ -0,0 +1,62 @@
+// CHECK_REGULAR_LOAD_STORE: call{{[ql]}} __asan_loadN@PLT
+// CHECK_REGULAR_LOAD_STORE: call{{[ql]}} __asan_storeN@PLT
+// RUN: %clangxx_asan -O2 -fsanitize-address-outline-instrumentation %s -o %t
+// RUN: %clangxx_asan -O2 -fsanitize-address-outline-instrumentation %s -o - -S \
+// RUN:   | FileCheck %s --check-prefix=CHECK_REGULAR_LOAD_STORE
+// RUN: not %run %t A 2>&1 | FileCheck %s
+// RUN: not %run %t B 2>&1 | FileCheck %s
+
+// CHECK_NOABORT_LOAD_STORE: call{{[ql]}} __asan_loadN_noabort@PLT
+// CHECK_NOABORT_LOAD_STORE: call{{[ql]}} __asan_storeN_noabort@PLT
+// RUN: %clangxx_asan -O2 -fsanitize-address-outline-instrumentation %s -o %t \
+// RUN:   -mllvm -asan-recover=1
+// RUN: %clangxx_asan -O2 -fsanitize-address-outline-instrumentation %s -o - -S \
+// RUN:   -mllvm -asan-recover=1 \
+// RUN:   | FileCheck %s --check-prefix=CHECK_NOABORT_LOAD_STORE
+// RUN: not %run %t A 2>&1 | FileCheck %s
+// RUN: not %run %t B 2>&1 | FileCheck %s
+
+// CHECK_EXP_LOAD_STORE: call{{[ql]}} __asan_exp_loadN@PLT
+// CHECK_EXP_LOAD_STORE: call{{[ql]}} __asan_exp_storeN@PLT
+// RUN: %clangxx_asan -O2 -fsanitize-address-outline-instrumentation %s -o %t \
+// RUN:   -mllvm -asan-force-experiment=42
+// RUN: %clangxx_asan -O2 -fsanitize-address-outline-instrumentation %s -o - -S \
+// RUN:   -mllvm -asan-force-experiment=42 \
+// RUN:   | FileCheck %s --check-prefix=CHECK_EXP_LOAD_STORE
+// RUN: not %run %t A 2>&1 | FileCheck %s
+// RUN: not %run %t B 2>&1 | FileCheck %s
+
+// CHECK: ERROR: AddressSanitizer: global-buffer-overflow on address
+
+#include <sanitizer/asan_interface.h>
+
+static int64_t mem = -1;
+static int64_t *volatile G = &mem;
+
+#include <stdlib.h>
+#include <string.h>
+
+inline uint16_t UNALIGNED_LOAD(const void *p) {
+  uint16_t data;
+  memcpy(&data, p, sizeof data);
+  return data;
+}
+
+inline void UNALIGNED_STORE(uint16_t data, void *p) {
+  memcpy(p, &data, sizeof data);
+}
+
+int main(int argc, char **argv) {
+  if (argc != 2)
+    return 1;
+  int res = 1;
+  switch (argv[1][0]) {
+  case 'A':
+    res = UNALIGNED_LOAD(reinterpret_cast<char *>(G) + 7);
+    break;
+  case 'B':
+    UNALIGNED_STORE(0, reinterpret_cast<char *>(G) + 7);
+    break;
+  }
+  return res;
+}