[compiler-rt] r252724 - [Asan] Added missing hunk to previous commit.

[Dmitry Vyukov via llvm-commits]

No, sorry, seems to work now.

On Wed, Nov 11, 2015 at 1:42 PM, Dmitry Vyukov <dvyukov at google.com> wrote:
> Something still seems to be missing:
>
> [67/1283] Building CXX object
> projects/compiler-rt/lib/asan/CMakeFiles/RTAsan_dynamic.i386.dir/asan_report.cc.o
> FAILED: /usr/bin/c++   -DASAN_DYNAMIC=1 -DASAN_HAS_EXCEPTIONS=1
> -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
> -D__STDC_LIMIT_MACROS -fPIC -fvisibility-inlines-hidden -Wall -W
> -Wno-unused-parameter -Wwrite-strings -Wcast-qual
> -Wno-missing-field-initializers -pedantic -Wno-long-long
> -Wno-maybe-uninitialized -Wno-comment -std=c++11 -ffunction-sections
> -fdata-sections -Wall -std=c++11 -O3 -DNDEBUG
> -Iprojects/compiler-rt/lib/asan -I../projects/compiler-rt/lib/asan
> -Iinclude -I../include -I../projects/compiler-rt/lib/asan/..
> -fPIC -fvisibility-inlines-hidden -Wall -W -Wno-unused-parameter
> -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic
> -Wno-long-long -Wno-maybe-uninitialized -Wno-comment -std=c++11
> -ffunction-sections -fdata-sections -Wall -std=c++11 -m32 -fPIC
> -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables
> -fno-stack-protector -fvisibility=hidden -fno-function-sections
> -fno-lto -O3 -g -Wno-variadic-macros -Wno-non-virtual-dtor -fno-rtti
> -ftls-model=initial-exec -MMD -MT
> projects/compiler-rt/lib/asan/CMakeFiles/RTAsan_dynamic.i386.dir/asan_report.cc.o
> -MF "projects/compiler-rt/lib/asan/CMakeFiles/RTAsan_dynamic.i386.dir/asan_report.cc.o.d"
> -o projects/compiler-rt/lib/asan/CMakeFiles/RTAsan_dynamic.i386.dir/asan_report.cc.o
> -c ../projects/compiler-rt/lib/asan/asan_report.cc
> ../projects/compiler-rt/lib/asan/asan_report.cc:1106:1: error:
> expected declaration before ‘}’ token
>  }  // namespace __asan
>  ^
>
>
>
> On Wed, Nov 11, 2015 at 1:24 PM, Yury Gribov via llvm-commits
> <llvm-commits at lists.llvm.org> wrote:
>> Author: ygribov
>> Date: Wed Nov 11 06:23:59 2015
>> New Revision: 252724
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=252724&view=rev
>> Log:
>> [Asan] Added missing hunk to previous commit.
>>
>> Modified:
>>     compiler-rt/trunk/lib/asan/asan_report.cc
>>
>> Modified: compiler-rt/trunk/lib/asan/asan_report.cc
>> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_report.cc?rev=252724&r1=252723&r2=252724&view=diff
>> ==============================================================================
>> --- compiler-rt/trunk/lib/asan/asan_report.cc (original)
>> +++ compiler-rt/trunk/lib/asan/asan_report.cc Wed Nov 11 06:23:59 2015
>> @@ -1002,13 +1002,8 @@ void ReportMacCfReallocUnknown(uptr addr
>>    DescribeHeapAddress(addr, 1);
>>  }
>>
>> -} // namespace __asan
>> -
>> -// --------------------------- Interface --------------------- {{{1
>> -using namespace __asan;  // NOLINT
>> -
>> -void __asan_report_error(uptr pc, uptr bp, uptr sp, uptr addr, int is_write,
>> -                         uptr access_size, u32 exp) {
>> +void ReportGenericError(uptr pc, uptr bp, uptr sp, uptr addr, bool is_write,
>> +                        uptr access_size, u32 exp, bool fatal) {
>>    ENABLE_FRAME_POINTER;
>>
>>    // Optimization experiments.
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits