From: Adrian Prantl <aprantl@apple.com>
Date: Tue, 1 Apr 2014 23:34:45 +0000 (+0000)
Subject: Add a doxygen comment to DebugLocEntry::Merge.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=45063c008e7675d25a994dea89f2f045ad19531f;p=oota-llvm.git

Add a doxygen comment to DebugLocEntry::Merge.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205374 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/AsmPrinter/DebugLocEntry.h b/lib/CodeGen/AsmPrinter/DebugLocEntry.h
index 0834b36013d..7551c8f0ced 100644
--- a/lib/CodeGen/AsmPrinter/DebugLocEntry.h
+++ b/lib/CodeGen/AsmPrinter/DebugLocEntry.h
@@ -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.
   bool Merge(const DebugLocEntry &Next) {
     if (End == Next.Begin && hasSameValueOrLocation(Next)) {
       End = Next.End;