Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 47 #define __lsan_register_root_region(addr, size) ((void)(addr), (void)(size)) | 47 #define __lsan_register_root_region(addr, size) ((void)(addr), (void)(size)) |
| 48 #define __lsan_unregister_root_region(addr, size) ((void)(addr), (void)(size)) | 48 #define __lsan_unregister_root_region(addr, size) ((void)(addr), (void)(size)) |
| 49 #endif | 49 #endif |
| 50 | 50 |
| 51 // FIXME: Have to handle (ADDRESS_SANITIZER && _WIN32) differently as it uses | 51 // FIXME: Have to handle (ADDRESS_SANITIZER && _WIN32) differently as it uses |
| 52 // both Clang (which supports the __attribute__ syntax) and CL (which doesn't) | 52 // both Clang (which supports the __attribute__ syntax) and CL (which doesn't) |
| 53 // as long as we use "clang-cl /fallback". This shouldn't be needed when Clang | 53 // as long as we use "clang-cl /fallback". This shouldn't be needed when Clang |
| 54 // handles all the code without falling back to CL. | 54 // handles all the code without falling back to CL. |
| 55 #if defined(ADDRESS_SANITIZER) && (!OS(WIN) || COMPILER(CLANG)) | 55 #if defined(ADDRESS_SANITIZER) && (!OS(WIN) || COMPILER(CLANG)) |
| 56 #define NO_SANITIZE_ADDRESS __attribute__((no_sanitize_address)) | 56 #define NO_SANITIZE_ADDRESS __attribute__((no_sanitize_address)) |
| 57 #if ENABLE(OILPAN) | |
| 58 // TODO(Oilpan): a temporary annotation while lazy sweeping is phased in. | |
| 59 // Remove the ENABLE(OILPAN) condition when lazy sweeping is globally enabled. | |
| 60 #define NO_LAZY_SWEEP_SANITIZE_ADDRESS NO_SANITIZE_ADDRESS | |
|
Nico
2016/10/02 00:54:39
Now that oilpan is on, do we still need this alter
| |
| 61 #else | |
| 62 #define NO_LAZY_SWEEP_SANITIZE_ADDRESS | |
| 63 #endif | |
| 57 #else | 64 #else |
| 58 #define NO_SANITIZE_ADDRESS | 65 #define NO_SANITIZE_ADDRESS |
| 66 #define NO_LAZY_SWEEP_SANITIZE_ADDRESS | |
| 59 #endif | 67 #endif |
| 60 | 68 |
| 61 const size_t asanMagic = 0xabefeed0; | 69 const size_t asanMagic = 0xabefeed0; |
| 62 const size_t asanDeferMemoryReuseCount = 2; | 70 const size_t asanDeferMemoryReuseCount = 2; |
| 63 const size_t asanDeferMemoryReuseMask = 0x3; | 71 const size_t asanDeferMemoryReuseMask = 0x3; |
| 64 | 72 |
| 65 #endif | 73 #endif |
| OLD | NEW |