[compiler-rt] r228137 - [ASan] Add the new __asan_mz_* symbols to asan_interface_internal.h

[Juergen Ributzka]

Reverted in r228172.

—Juergen

> On Feb 4, 2015, at 11:13 AM, Juergen Ributzka <juergen at apple.com> wrote:
> 
> Hi Alexander,
> 
> I will revert the commit until you have a fix. The bots have been broken for several hours now.
> 
> —Juergen
> 
>> On Feb 4, 2015, at 8:57 AM, Alexander Potapenko <glider at google.com <mailto:glider at google.com>> wrote:
>> 
>> Yeah, looking.
>> 
>> On Wed, Feb 4, 2015 at 7:56 PM, Juergen Ributzka <juergen at apple.com <mailto:juergen at apple.com>> wrote:
>>> Hi Alexander,
>>> 
>>> this broke the build:
>>> http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA_build/4384/consoleFull#162078709849ba4694-19c4-4d7e-bec5-911270d8a58c <http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA_build/4384/consoleFull#162078709849ba4694-19c4-4d7e-bec5-911270d8a58c>
>>> 
>>> Could you please take a look?
>>> 
>>> Thanks
>>> 
>>> —Juergen
>>> 
>>> On Feb 4, 2015, at 4:42 AM, Alexander Potapenko <glider at google.com> wrote:
>>> 
>>> Author: glider
>>> Date: Wed Feb  4 06:42:12 2015
>>> New Revision: 228137
>>> 
>>> URL: http://llvm.org/viewvc/llvm-project?rev=228137&view=rev
>>> Log:
>>> [ASan] Add the new __asan_mz_* symbols to asan_interface_internal.h
>>> to fix the interface_symbols_darwin.c test.
>>> 
>>> Modified:
>>>   compiler-rt/trunk/lib/asan/asan_interface_internal.h
>>>   compiler-rt/trunk/lib/asan/asan_malloc_mac.cc
>>> 
>>> Modified: compiler-rt/trunk/lib/asan/asan_interface_internal.h
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_interface_internal.h?rev=228137&r1=228136&r2=228137&view=diff
>>> ==============================================================================
>>> --- compiler-rt/trunk/lib/asan/asan_interface_internal.h (original)
>>> +++ compiler-rt/trunk/lib/asan/asan_interface_internal.h Wed Feb  4 06:42:12
>>> 2015
>>> @@ -177,6 +177,24 @@ extern "C" {
>>>  void __asan_poison_intra_object_redzone(uptr p, uptr size);
>>>  SANITIZER_INTERFACE_ATTRIBUTE
>>>  void __asan_unpoison_intra_object_redzone(uptr p, uptr size);
>>> +#if SANITIZER_MAC
>>> +  SANITIZER_INTERFACE_ATTRIBUTE
>>> +  void * __asan_mz_calloc(void *zone, uptr nmemb, uptr size);
>>> +  SANITIZER_INTERFACE_ATTRIBUTE
>>> +  void __asan_mz_destroy(void* zone);
>>> +  SANITIZER_INTERFACE_ATTRIBUTE
>>> +  void __asan_mz_free(void *zone, void *ptr);
>>> +  SANITIZER_INTERFACE_ATTRIBUTE
>>> +  void * __asan_mz_malloc(void *zone, uptr size);
>>> +  SANITIZER_INTERFACE_ATTRIBUTE
>>> +  void * __asan_mz_memalign(void *zone, uptr align, uptr size);
>>> +  SANITIZER_INTERFACE_ATTRIBUTE
>>> +  void * __asan_mz_realloc(void *zone, void *ptr, uptr size);
>>> +  SANITIZER_INTERFACE_ATTRIBUTE
>>> +  uptr __asan_mz_size(void *zone, const void* ptr);
>>> +  SANITIZER_INTERFACE_ATTRIBUTE
>>> +  void * __asan_mz_valloc(void *zone, uptr size);
>>> +#endif  // SANITIZER_MAC
>>> }  // extern "C"
>>> 
>>> #endif  // ASAN_INTERFACE_INTERNAL_H
>>> 
>>> Modified: compiler-rt/trunk/lib/asan/asan_malloc_mac.cc
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_malloc_mac.cc?rev=228137&r1=228136&r2=228137&view=diff
>>> ==============================================================================
>>> --- compiler-rt/trunk/lib/asan/asan_malloc_mac.cc (original)
>>> +++ compiler-rt/trunk/lib/asan/asan_malloc_mac.cc Wed Feb  4 06:42:12 2015
>>> @@ -156,7 +156,7 @@ namespace {
>>> // wrappers, as they are basically copied from there.
>>> extern "C"
>>> SANITIZER_INTERFACE_ATTRIBUTE
>>> -size_t __asan_mz_size(malloc_zone_t* zone, const void* ptr) {
>>> +size_t __asan_mz_size(malloc_zone_t *zone, const void* ptr) {
>>>  return asan_mz_size(ptr);
>>> }
>>> 
>>> 
>>> 
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at cs.uiuc.edu
>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>> 
>>> 
>> 
>> 
>> 
>> -- 
>> Alexander Potapenko
>> Software Engineer
>> Google Moscow
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150204/70869fa3/attachment.html>