<div dir="ltr">It makes no sense to format it using Google style, like Alexey said.<div>It would also be a problem when someone else edited the file and used the LLVM clang-format style, because that's what will get picked up due to our llvm/.clang-format file.</div><div><br></div><div>The diff being large or small shouldn't be a problem when the only change to the file is "applied clang-format. NFC".</div><div class="gmail_extra"><br clear="all"><div><div class="gmail_signature"> Filipe<br></div></div>
<br><div class="gmail_quote">On Fri, Jun 12, 2015 at 10:40 AM, Alexey Samsonov <span dir="ltr"><<a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Yeah, AddressSanitizer.cpp was originally written (and updated) with Google style, but I think that it resides in LLVM for too long that we should migrate it eventually.<div>For instance, it makes hard to move the code to/from this file from another parts of LLVM.</div></div><div class="gmail_extra"><div><div class="h5"><br><div class="gmail_quote">On Fri, Jun 12, 2015 at 8:46 AM, Alexander Potapenko <span dir="ltr"><<a href="mailto:glider@google.com" target="_blank">glider@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I've asked Dima and he told me we've used Google style previously,<br>
this was also my impression.<br>
I think I've tried the default style and the diff was larger.<br>
<div><div><br>
On Fri, Jun 12, 2015 at 5:42 PM, Alexey Samsonov <<a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a>> wrote:<br>
> Why don't we use LLVM style instead?<br>
><br>
> On Fri, Jun 12, 2015 at 4:27 AM, Alexander Potapenko <<a href="mailto:glider@google.com" target="_blank">glider@google.com</a>><br>
> wrote:<br>
>><br>
>> Author: glider<br>
>> Date: Fri Jun 12 06:27:06 2015<br>
>> New Revision: 239601<br>
>><br>
>> URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D239601-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=CKkF-kcf_iKeNpk4ow6p1bActflH0MWhwxSeFleM7vo&s=kiLfkdV4vJlltiJdSaaj-yS9Bi1Luqz2ThlyijPvYsA&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=239601&view=rev</a><br>
>> Log:<br>
>> [ASan] format AddressSanitizer.cpp with `clang-format -style=Google`, NFC<br>
>><br>
>> Modified:<br>
>> llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp<br>
>><br>
>> Modified: llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp<br>
>> URL:<br>
>> <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_lib_Transforms_Instrumentation_AddressSanitizer.cpp-3Frev-3D239601-26r1-3D239600-26r2-3D239601-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=CKkF-kcf_iKeNpk4ow6p1bActflH0MWhwxSeFleM7vo&s=LD0OqRY8FkLfHFnqO3LWRXOgMJ26qcy9FGONZKqJ-88&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp?rev=239601&r1=239600&r2=239601&view=diff</a><br>
>><br>
>> ==============================================================================<br>
>> --- llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp<br>
>> (original)<br>
>> +++ llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp Fri Jun<br>
>> 12 06:27:06 2015<br>
>> @@ -106,10 +106,8 @@ static const char *const kAsanUnpoisonSt<br>
>> static const char *const kAsanOptionDetectUAR =<br>
>> "__asan_option_detect_stack_use_after_return";<br>
>><br>
>> -static const char *const kAsanAllocaPoison =<br>
>> - "__asan_alloca_poison";<br>
>> -static const char *const kAsanAllocasUnpoison =<br>
>> - "__asan_allocas_unpoison";<br>
>> +static const char *const kAsanAllocaPoison = "__asan_alloca_poison";<br>
>> +static const char *const kAsanAllocasUnpoison =<br>
>> "__asan_allocas_unpoison";<br>
>><br>
>> // Accesses sizes are powers of two: 1, 2, 4, 8, 16.<br>
>> static const size_t kNumberOfAccessSizes = 5;<br>
>> @@ -410,8 +408,7 @@ struct AddressSanitizer : public Functio<br>
>> /// If it is an interesting memory access, return the PointerOperand<br>
>> /// and set IsWrite/Alignment. Otherwise return nullptr.<br>
>> Value *isInterestingMemoryAccess(Instruction *I, bool *IsWrite,<br>
>> - uint64_t *TypeSize,<br>
>> - unsigned *Alignment);<br>
>> + uint64_t *TypeSize, unsigned<br>
>> *Alignment);<br>
>> void instrumentMop(ObjectSizeOffsetVisitor &ObjSizeVis, Instruction *I,<br>
>> bool UseCalls, const DataLayout &DL);<br>
>> void instrumentPointerComparisonOrSubtraction(Instruction *I);<br>
>> @@ -588,7 +585,7 @@ struct FunctionStackPoisoner : public In<br>
>> Value *SavedStack) {<br>
>> IRBuilder<> IRB(InstBefore);<br>
>> IRB.CreateCall(AsanAllocasUnpoisonFunc,<br>
>> - {IRB.CreateLoad(DynamicAllocaLayout),<br>
>> + {IRB.CreateLoad(DynamicAllocaLayout),<br>
>> IRB.CreatePtrToInt(SavedStack, IntptrTy)});<br>
>> }<br>
>><br>
>> @@ -1706,8 +1703,7 @@ void FunctionStackPoisoner::poisonStack(<br>
>> if (ClInstrumentAllocas && DynamicAllocaVec.size() > 0) {<br>
>> // Handle dynamic allocas.<br>
>> createDynamicAllocasInitStorage();<br>
>> - for (auto &AI : DynamicAllocaVec)<br>
>> - handleDynamicAllocaCall(AI);<br>
>> + for (auto &AI : DynamicAllocaVec) handleDynamicAllocaCall(AI);<br>
>><br>
>> unpoisonDynamicAllocas();<br>
>> }<br>
>> @@ -1901,9 +1897,9 @@ void FunctionStackPoisoner::poisonAlloca<br>
>> // For now just insert the call to ASan runtime.<br>
>> Value *AddrArg = IRB.CreatePointerCast(V, IntptrTy);<br>
>> Value *SizeArg = ConstantInt::get(IntptrTy, Size);<br>
>> - IRB.CreateCall(DoPoison ? AsanPoisonStackMemoryFunc<br>
>> - : AsanUnpoisonStackMemoryFunc,<br>
>> - {AddrArg, SizeArg});<br>
>> + IRB.CreateCall(<br>
>> + DoPoison ? AsanPoisonStackMemoryFunc : AsanUnpoisonStackMemoryFunc,<br>
>> + {AddrArg, SizeArg});<br>
>> }<br>
>><br>
>> // Handling llvm.lifetime intrinsics for a given %alloca:<br>
>><br>
>><br>
>> _______________________________________________<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" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
><br>
><br>
><br>
><br>
> --<br>
> Alexey Samsonov<br>
> <a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a><br>
<br>
<br>
<br>
</div></div><span><font color="#888888">--<br>
Alexander Potapenko<br>
Software Engineer<br>
<br>
Google Germany GmbH<br>
Dienerstraße 12<br>
80331 München<br>
</font></span></blockquote></div><br><br clear="all"><div><br></div></div></div><span class="HOEnZb"><font color="#888888">-- <br><div><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</font></span></div>
<br>_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
<br></blockquote></div><br></div></div>