Index: lib/asan/CMakeLists.txt
===================================================================
--- lib/asan/CMakeLists.txt
+++ lib/asan/CMakeLists.txt
@@ -18,6 +18,7 @@
   asan_rtl.cc
   asan_stack.cc
   asan_stats.cc
+  asan_suppressions.cc
   asan_thread.cc
   asan_win.cc)
 
Index: lib/asan/asan_interceptors.cc
===================================================================
--- lib/asan/asan_interceptors.cc
+++ lib/asan/asan_interceptors.cc
@@ -20,6 +20,7 @@
 #include "asan_report.h"
 #include "asan_stack.h"
 #include "asan_stats.h"
+#include "asan_suppressions.h"
 #include "sanitizer_common/sanitizer_libc.h"
 
 namespace __asan {
@@ -50,7 +51,10 @@
     if (!QuickCheckForUnpoisonedRegion(__offset, __size) &&             \
         (__bad = __asan_region_is_poisoned(__offset, __size))) {        \
       GET_CURRENT_PC_BP_SP;                                             \
-      __asan_report_error(pc, bp, sp, __bad, isWrite, __size);          \
+      GET_STACK_TRACE(kStackTraceMax, true);                            \
+      if (!IsSuppressed(&stack)) {                                      \
+        __asan_report_error(pc, bp, sp, __bad, isWrite, __size);        \
+      }                                                                 \
     }                                                                   \
   } while (0)
 
Index: lib/asan/asan_rtl.cc
===================================================================
--- lib/asan/asan_rtl.cc
+++ lib/asan/asan_rtl.cc
@@ -21,6 +21,7 @@
 #include "asan_report.h"
 #include "asan_stack.h"
 #include "asan_stats.h"
+#include "asan_suppressions.h"
 #include "asan_thread.h"
 #include "sanitizer_common/sanitizer_atomic.h"
 #include "sanitizer_common/sanitizer_flags.h"
@@ -596,6 +597,8 @@
 
   InitializeAsanInterceptors();
 
+  InitializeSuppressions();
+
   // Enable system log ("adb logcat") on Android.
   // Doing this before interceptors are initialized crashes in:
   // AsanInitInternal -> android_log_write -> __interceptor_strcmp
Index: lib/asan/asan_suppressions.h
===================================================================
--- lib/asan/asan_suppressions.h
+++ lib/asan/asan_suppressions.h
@@ -0,0 +1,27 @@
+//===-- asan_suppressions.h -------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file is a part of AddressSanitizer, an address sanity checker.
+//
+// ASan-private header for asan_suppressions.cc.
+//===----------------------------------------------------------------------===//
+#ifndef ASAN_SUPPRESSIONS_H
+#define ASAN_SUPPRESSIONS_H
+
+#include "asan_internal.h"
+#include "sanitizer_common/sanitizer_suppressions.h"
+
+namespace __asan {
+
+void InitializeSuppressions();
+bool IsSuppressed(const BufferedStackTrace *stack);
+
+}  // namespace __asan
+
+#endif  // ASAN_SUPPRESSIONS_H
Index: lib/asan/asan_suppressions.cc
===================================================================
--- lib/asan/asan_suppressions.cc
+++ lib/asan/asan_suppressions.cc
@@ -0,0 +1,62 @@
+//===-- asan_suppressions.cc ----------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file is a part of AddressSanitizer, an address sanity checker.
+//
+// Issue suppression and suppression-related functions.
+//===----------------------------------------------------------------------===//
+
+#include "asan_suppressions.h"
+
+#include "sanitizer_common/sanitizer_common.h"
+#include "sanitizer_common/sanitizer_symbolizer.h"
+
+namespace __asan {
+
+bool IsSuppressed(const BufferedStackTrace *stack) {
+  SuppressionContext *ctx = SuppressionContext::Get();
+  if (ctx->SuppressionCount() == 0 || stack == 0)
+    return false;
+
+  ReportStack *symbolized_stack = SymbolizeStack(*stack, /*strip_main*/ false);
+  for (ReportStack *frame = symbolized_stack; frame; frame = frame->next) {
+    const AddressInfo &info = frame->info;
+    bool matched = false;
+    Suppression *s;
+
+    if (frame->next == nullptr) {
+      // The last frame contains the name of the interceptor.
+      if (ctx->Match(info.function, SuppressionASanInterceptor, &s))
+        matched = true;
+    } else {
+      if (ctx->Match(info.function, SuppressionASanFunction, &s))
+        matched = true;
+    }
+
+    if (ctx->Match(info.module, SuppressionASanLibrary, &s))
+      matched = true;
+
+    if (matched) {
+      Report("AddressSanitizer: matched suppression '%s'\n", s->templ);
+      s->hit_count++;
+      return true;
+    }
+  }
+  return false;
+}
+
+static bool suppressions_inited = false;
+
+void InitializeSuppressions() {
+  CHECK(!suppressions_inited);
+  SuppressionContext::InitIfNecessary();
+  suppressions_inited = true;
+}
+
+}  // namespace __asan
Index: lib/sanitizer_common/sanitizer_suppressions.h
===================================================================
--- lib/sanitizer_common/sanitizer_suppressions.h
+++ lib/sanitizer_common/sanitizer_suppressions.h
@@ -28,6 +28,9 @@
   SuppressionLib,
   SuppressionDeadlock,
   SuppressionVptrCheck,
+  SuppressionASanInterceptor,
+  SuppressionASanFunction,
+  SuppressionASanLibrary,
   SuppressionTypeCount
 };
 
Index: lib/sanitizer_common/sanitizer_suppressions.cc
===================================================================
--- lib/sanitizer_common/sanitizer_suppressions.cc
+++ lib/sanitizer_common/sanitizer_suppressions.cc
@@ -23,7 +23,8 @@
 
 static const char *const kTypeStrings[SuppressionTypeCount] = {
     "none", "race",            "mutex",    "thread",    "signal",
-    "leak", "called_from_lib", "deadlock", "vptr_check"};
+    "leak", "called_from_lib", "deadlock", "vptr_check",
+    "asan_interceptor", "asan_function", "asan_library"};
 
 bool TemplateMatch(char *templ, const char *str) {
   if (str == 0 || str[0] == 0)
Index: test/asan/TestCases/Darwin/suppressions-darwin.cc
===================================================================
--- test/asan/TestCases/Darwin/suppressions-darwin.cc
+++ test/asan/TestCases/Darwin/suppressions-darwin.cc
@@ -0,0 +1,32 @@
+// Check that without suppressions, we catch the issue.
+// RUN: %clangxx_asan -O0 %s -o %t -framework Foundation
+// RUN: not %run %t 2>&1 | FileCheck --check-prefix=CHECK-CRASH %s
+
+// Check that suppressing the API function name works.
+// RUN: echo "asan_function:CFStringCreateWithBytes" > %tmp
+// RUN: ASAN_OPTIONS=suppressions=%tmp %run %t 2>&1 | FileCheck --check-prefix=CHECK-IGNORE %s
+
+// Check that suppressing the interceptor by name works.
+// RUN: echo "asan_interceptor:memmove" > %tmp
+// RUN: ASAN_OPTIONS=suppressions=%tmp %run %t 2>&1 | FileCheck --check-prefix=CHECK-IGNORE %s
+
+// Check that suppressing all reports from a library works.
+// RUN: echo "asan_library:CoreFoundation" > %tmp
+// RUN: ASAN_OPTIONS=suppressions=%tmp %run %t 2>&1 | FileCheck --check-prefix=CHECK-IGNORE %s
+
+// Check that suppressing library works even without the symbolizer.
+// RUN: ASAN_OPTIONS=suppressions=%tmp ASAN_SYMBOLIZER_PATH=/dev/null %run %t 2>&1 | FileCheck --check-prefix=CHECK-IGNORE %s
+
+#include <CoreFoundation/CoreFoundation.h>
+
+int main() {
+  char *a = (char *)malloc(6);
+  strcpy(a, "hello");
+  CFStringRef str = CFStringCreateWithBytes(kCFAllocatorDefault, (unsigned char *)a, 10, kCFStringEncodingUTF8, FALSE); // BOOM
+  fprintf(stderr, "Ignored.\n");
+}
+
+// CHECK-CRASH: AddressSanitizer: heap-buffer-overflow
+// CHECK-CRASH-NOT: Ignored.
+// CHECK-IGNORE: Ignored.
+// CHECK-IGNORE-NOT: AddressSanitizer: heap-buffer-overflow
Index: test/asan/TestCases/suppressions.cc
===================================================================
--- test/asan/TestCases/suppressions.cc
+++ test/asan/TestCases/suppressions.cc
@@ -0,0 +1,24 @@
+// Check that without suppressions, we catch the issue.
+// RUN: %clangxx_asan -O0 %s -o %t -framework Foundation
+// RUN: not %run %t 2>&1 | FileCheck --check-prefix=CHECK-CRASH %s
+
+// RUN: echo "asan_interceptor:strlen" > %tmp
+// RUN: echo "asan_interceptor:memmove" >> %tmp
+// RUN: ASAN_OPTIONS=suppressions=%tmp %run %t 2>&1 | FileCheck --check-prefix=CHECK-IGNORE %s
+
+#include <CoreFoundation/CoreFoundation.h>
+
+int main() {
+  char *a = (char *)malloc(6);
+  free(a);
+  strlen(a); // BOOM
+  memmove(a, a, 6); // BOOM
+  fprintf(stderr, "Ignored.\n");
+}
+
+// CHECK-CRASH: AddressSanitizer: heap-use-after-free
+// CHECK-CRASH-NOT: Ignored.
+// CHECK-IGNORE: AddressSanitizer: matched suppression 'strlen'
+// CHECK-IGNORE: AddressSanitizer: matched suppression 'memmove'
+// CHECK-IGNORE: Ignored.
+// CHECK-IGNORE-NOT: AddressSanitizer: heap-use-after-free