[llvm] r205374 - Add a doxygen comment to DebugLocEntry::Merge.

[Adrian Prantl]

Fixed in 205429.

-- adrian

On Apr 1, 2014, at 5:50 PM, David Blaikie <dblaikie at gmail.com> wrote:

> On Tue, Apr 1, 2014 at 4:34 PM, Adrian Prantl <aprantl at apple.com> wrote:
>> Author: adrian
>> Date: Tue Apr  1 18:34:45 2014
>> New Revision: 205374
>> 
>> URL: http://llvm.org/viewvc/llvm-project?rev=205374&view=rev
>> Log:
>> Add a doxygen comment to DebugLocEntry::Merge.
>> 
>> Modified:
>>    llvm/trunk/lib/CodeGen/AsmPrinter/DebugLocEntry.h
>> 
>> Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DebugLocEntry.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DebugLocEntry.h?rev=205374&r1=205373&r2=205374&view=diff
>> ==============================================================================
>> --- llvm/trunk/lib/CodeGen/AsmPrinter/DebugLocEntry.h (original)
>> +++ llvm/trunk/lib/CodeGen/AsmPrinter/DebugLocEntry.h Tue Apr  1 18:34:45 2014
>> @@ -94,6 +94,9 @@ public:
>>     EntryKind = E_ConstantInt;
>>   }
>> 
>> +  /// \brief Attempt to merge this DebugLocEntry with Next and return
>> +  /// true if the merge was successful. Entries can be merged if they
>> +  /// share the same Loc/Constant and their ranges are adjacent.
> 
> Technically, only if the specified entry is immediately after the
> current one (ie: it doesn't work when called the other way around),
> but I don't much care if that's not called out in the comment.
> 
>>   bool Merge(const DebugLocEntry &Next) {
>>     if (End == Next.Begin && hasSameValueOrLocation(Next)) {
>>       End = Next.End;
>> 
>> 
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits