commit b740316a122b5ceaaa7cf50557b1b39af5fbbf5f
author Dmitri Gribenko <gribozavr@gmail.com> Mon Jul 30 17:38:19 2012 +0000
committer Dmitri Gribenko <gribozavr@gmail.com> Mon Jul 30 17:38:19 2012 +0000
tree 9701ca88dcdb8258ce3df012a9095f83c784f73f
parent cec9ce49dcf4b4b768043f96c8ef8c1d4cdbb6b9

Add an assert to ParamCommandComment::getParamIndex() -- it should not be
called unless index is valid.


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

include/clang/AST/Comment.h

diff --git a/include/clang/AST/Comment.h b/include/clang/AST/Comment.h
index 55cb081..4c20618 100644
--- a/include/clang/AST/Comment.h
+++ b/include/clang/AST/Comment.h
@@ -713,6 +713,7 @@
   }
 
   unsigned getParamIndex() const LLVM_READONLY {
+    assert(isParamIndexValid());
     return ParamIndex;
   }
 

tools/libclang/CXComment.cpp

diff --git a/tools/libclang/CXComment.cpp b/tools/libclang/CXComment.cpp
index dfa7820..4189b31 100644
--- a/tools/libclang/CXComment.cpp
+++ b/tools/libclang/CXComment.cpp
@@ -256,7 +256,7 @@
 
 unsigned clang_ParamCommandComment_getParamIndex(CXComment CXC) {
   const ParamCommandComment *PCC = getASTNodeAs<ParamCommandComment>(CXC);
-  if (!PCC)
+  if (!PCC || !PCC->isParamIndexValid())
     return ParamCommandComment::InvalidParamIndex;
 
   return PCC->getParamIndex();
@@ -316,11 +316,18 @@
 
 class ParamCommandCommentCompareIndex {
 public:
+  /// This comparison will sort parameters with valid index by index and
+  /// invalid (unresolved) parameters last.
   bool operator()(const ParamCommandComment *LHS,
                   const ParamCommandComment *RHS) const {
-    // To sort invalid (unresolved) parameters last, this comparison relies on
-    // invalid indices to be UINT_MAX.
-    return LHS->getParamIndex() < RHS->getParamIndex();
+    unsigned LHSIndex = UINT_MAX;
+    unsigned RHSIndex = UINT_MAX;
+    if (LHS->isParamIndexValid())
+      LHSIndex = LHS->getParamIndex();
+    if (RHS->isParamIndexValid())
+      RHSIndex = RHS->getParamIndex();
+
+    return LHSIndex < RHSIndex;
   }
 };