Index: compiler-rt/trunk/lib/asan/asan_fake_stack.cc
===================================================================
--- compiler-rt/trunk/lib/asan/asan_fake_stack.cc
+++ compiler-rt/trunk/lib/asan/asan_fake_stack.cc
@@ -28,9 +28,9 @@
 
 // For small size classes inline PoisonShadow for better performance.
 ALWAYS_INLINE void SetShadow(uptr ptr, uptr size, uptr class_id, u64 magic) {
-  CHECK_EQ(SHADOW_SCALE, 3);  // This code expects SHADOW_SCALE=3.
   u64 *shadow = reinterpret_cast<u64*>(MemToShadow(ptr));
-  if (class_id <= 6) {
+  if (SHADOW_SCALE == 3 && class_id <= 6) {
+    // This code expects SHADOW_SCALE=3.
     for (uptr i = 0; i < (((uptr)1) << class_id); i++) {
       shadow[i] = magic;
       // Make sure this does not become memset.