<p dir="ltr">Thanks!</p>
<br><div class="gmail_quote">вт, 3 февр. 2015, 22:01, Hans Wennborg <<a href="mailto:hans@chromium.org">hans@chromium.org</a>>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Tue, Feb 3, 2015 at 10:37 AM, Timur Iskhodzhanov <<a href="mailto:timurrrr@google.com" target="_blank">timurrrr@google.com</a>> wrote:<br>
><br>
> Hans,<br>
><br>
> Can we merge this (along with the compiler-rt part) to 3.6.0?<br>
<br>
Merged in r228008.<br>
<br>
Thanks,<br>
Hans<br>
<br>
> чт, 22 янв. 2015, 15:31, Timur Iskhodzhanov <<a href="mailto:timurrrr@google.com" target="_blank">timurrrr@google.com</a>>:<br>
><br>
>> Author: timurrrr<br>
>> Date: Thu Jan 22 06:24:21 2015<br>
>> New Revision: 226809<br>
>><br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=226809&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=226809&view=rev</a><br>
>> Log:<br>
>> [ASan/Win] Move the shadow to 0x30000000<br>
>><br>
>> Modified:<br>
>>     llvm/trunk/lib/Transforms/<u></u>Instrumentation/<u></u>AddressSanitizer.cpp<br>
>><br>
>> Modified: llvm/trunk/lib/Transforms/<u></u>Instrumentation/<u></u>AddressSanitizer.cpp<br>
>> URL:<br>
>> <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp?rev=226809&r1=226808&r2=226809&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/lib/<u></u>Transforms/Instrumentation/<u></u>AddressSanitizer.cpp?rev=<u></u>226809&r1=226808&r2=226809&<u></u>view=diff</a><br>
>><br>
>> ==============================<u></u>==============================<u></u>==================<br>
>> --- llvm/trunk/lib/Transforms/<u></u>Instrumentation/<u></u>AddressSanitizer.cpp<br>
>> (original)<br>
>> +++ llvm/trunk/lib/Transforms/<u></u>Instrumentation/<u></u>AddressSanitizer.cpp Thu Jan<br>
>> 22 06:24:21 2015<br>
>> @@ -67,7 +67,7 @@ static const uint64_t kMIPS32_ShadowOffs<br>
>>  static const uint64_t kMIPS64_ShadowOffset64 = 1ULL << 36;<br>
>>  static const uint64_t kFreeBSD_ShadowOffset32 = 1ULL << 30;<br>
>>  static const uint64_t kFreeBSD_ShadowOffset64 = 1ULL << 46;<br>
>> -static const uint64_t kWindowsShadowOffset32 = 1ULL << 30;<br>
>> +static const uint64_t kWindowsShadowOffset32 = 3ULL << 28;<br>
>><br>
>>  static const size_t kMinStackMallocSize = 1 << 6;  // 64B<br>
>>  static const size_t kMaxStackMallocSize = 1 << 16;  // 64K<br>
>><br>
>><br>
>> ______________________________<u></u>_________________<br>
>> llvm-commits mailing list<br>
>> <a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
>> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/<u></u>mailman/listinfo/llvm-commits</a><br>
><br>
><br>
> ______________________________<u></u>_________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/<u></u>mailman/listinfo/llvm-commits</a><br>
><br>
</blockquote></div>