[cfe-commits] r158807 - in /cfe/trunk: include/clang/AST/ include/clang/Comments/ lib/ lib/AST/ lib/Comments/ lib/Sema/ tools/arcmt-test/ tools/c-index-test/ tools/clang-check/ tools/diagtool/ tools/driver/ tools/libclang/ unittests/Frontend/ unittests/Tooling/

Chandler Carruth chandlerc at gmail.com
Wed Jun 20 02:53:53 PDT 2012


Author: chandlerc
Date: Wed Jun 20 04:53:52 2012
New Revision: 158807

URL: http://llvm.org/viewvc/llvm-project?rev=158807&view=rev
Log:
Fix a big layering violation introduced by r158771.

That commit added a new library just to hold the RawCommentList. I've
started a discussion on the commit thread about whether that is really
meritted -- it certainly doesn't seem necessary at this stage.

However, the immediate problem is that the AST library has a hard
dependency on the Comment library, but the dependencies were set up
completely backward. In addition to the layering violation, this had an
unfortunate effect if scattering the Comments library dependency
throughout the build system, but inconsistently so -- several parts of
the CMake dependencies were missing and only showed up due to transitive
deps or the fact that the target wasn't being built by tho bots.

It turns out that the Comments library can't (currently) be a well
formed layer *below* the AST library either, as it has an API that
accepts an ASTContext. That parameter is currently unused, so maybe that
was a mistake?

Anyways, it really seems like this is logically part of the AST --
that's the whole point of the ASTContext providing access to it as far
as I can tell -- so I've merged it into the AST library to solve the
immediate layering violation problems and remove some of the churn from
our library dependencies.

Added:
    cfe/trunk/include/clang/AST/RawCommentList.h
      - copied, changed from r158801, cfe/trunk/include/clang/Comments/RawCommentList.h
    cfe/trunk/lib/AST/RawCommentList.cpp
      - copied, changed from r158801, cfe/trunk/lib/Comments/RawCommentList.cpp
Removed:
    cfe/trunk/include/clang/Comments/RawCommentList.h
    cfe/trunk/lib/Comments/CMakeLists.txt
    cfe/trunk/lib/Comments/Makefile
    cfe/trunk/lib/Comments/RawCommentList.cpp
Modified:
    cfe/trunk/include/clang/AST/ASTContext.h
    cfe/trunk/lib/AST/CMakeLists.txt
    cfe/trunk/lib/CMakeLists.txt
    cfe/trunk/lib/Makefile
    cfe/trunk/lib/Sema/CMakeLists.txt
    cfe/trunk/tools/arcmt-test/Makefile
    cfe/trunk/tools/c-index-test/Makefile
    cfe/trunk/tools/clang-check/CMakeLists.txt
    cfe/trunk/tools/clang-check/Makefile
    cfe/trunk/tools/diagtool/Makefile
    cfe/trunk/tools/driver/Makefile
    cfe/trunk/tools/libclang/CMakeLists.txt
    cfe/trunk/tools/libclang/Makefile
    cfe/trunk/unittests/Frontend/Makefile
    cfe/trunk/unittests/Tooling/Makefile

Modified: cfe/trunk/include/clang/AST/ASTContext.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/ASTContext.h?rev=158807&r1=158806&r2=158807&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/ASTContext.h (original)
+++ cfe/trunk/include/clang/AST/ASTContext.h Wed Jun 20 04:53:52 2012
@@ -27,7 +27,7 @@
 #include "clang/AST/TemplateName.h"
 #include "clang/AST/Type.h"
 #include "clang/AST/CanonicalType.h"
-#include "clang/Comments/RawCommentList.h"
+#include "clang/AST/RawCommentList.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"

Copied: cfe/trunk/include/clang/AST/RawCommentList.h (from r158801, cfe/trunk/include/clang/Comments/RawCommentList.h)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/RawCommentList.h?p2=cfe/trunk/include/clang/AST/RawCommentList.h&p1=cfe/trunk/include/clang/Comments/RawCommentList.h&r1=158801&r2=158807&rev=158807&view=diff
==============================================================================
    (empty)

Removed: cfe/trunk/include/clang/Comments/RawCommentList.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Comments/RawCommentList.h?rev=158806&view=auto
==============================================================================
--- cfe/trunk/include/clang/Comments/RawCommentList.h (original)
+++ cfe/trunk/include/clang/Comments/RawCommentList.h (removed)
@@ -1,172 +0,0 @@
-//===--- RawCommentList.h - Classes for processing raw comments -*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_COMMENTS_RAW_COMMENT_LIST_H
-#define LLVM_CLANG_COMMENTS_RAW_COMMENT_LIST_H
-
-#include "clang/Basic/SourceManager.h"
-#include "llvm/ADT/ArrayRef.h"
-
-namespace clang {
-
-class ASTContext;
-class ASTReader;
-
-class RawComment {
-public:
-  enum CommentKind {
-    CK_Invalid,      ///< Invalid comment
-    CK_OrdinaryBCPL, ///< Any normal BCPL comments
-    CK_OrdinaryC,    ///< Any normal C comment
-    CK_BCPLSlash,    ///< \code /// stuff \endcode
-    CK_BCPLExcl,     ///< \code //! stuff \endcode
-    CK_JavaDoc,      ///< \code /** stuff */ \endcode
-    CK_Qt,           ///< \code /*! stuff */ \endcode, also used by HeaderDoc
-    CK_Merged        ///< Two or more Doxygen comments merged together
-  };
-
-  RawComment() : Kind(CK_Invalid), IsAlmostTrailingComment(false) { }
-
-  RawComment(const SourceManager &SourceMgr, SourceRange SR,
-             bool Merged = false);
-
-  CommentKind getKind() const LLVM_READONLY {
-    return (CommentKind) Kind;
-  }
-
-  bool isInvalid() const LLVM_READONLY {
-    return Kind == CK_Invalid;
-  }
-
-  bool isMerged() const LLVM_READONLY {
-    return Kind == CK_Merged;
-  }
-
-  /// Returns true if it is a comment that should be put after a member:
-  /// \code ///< stuff \endcode
-  /// \code //!< stuff \endcode
-  /// \code /**< stuff */ \endcode
-  /// \code /*!< stuff */ \endcode
-  bool isTrailingComment() const LLVM_READONLY {
-    assert(isDoxygen());
-    return IsTrailingComment;
-  }
-
-  /// Returns true if it is a probable typo:
-  /// \code //< stuff \endcode
-  /// \code /*< stuff */ \endcode
-  bool isAlmostTrailingComment() const LLVM_READONLY {
-    return IsAlmostTrailingComment;
-  }
-
-  /// Returns true if this comment is not a Doxygen comment.
-  bool isOrdinary() const LLVM_READONLY {
-    return (Kind == CK_OrdinaryBCPL) || (Kind == CK_OrdinaryC);
-  }
-
-  /// Returns true if this comment any kind of a Doxygen comment.
-  bool isDoxygen() const LLVM_READONLY {
-    return !isInvalid() && !isOrdinary();
-  }
-
-  /// Returns raw comment text with comment markers.
-  StringRef getRawText(const SourceManager &SourceMgr) const {
-    if (RawTextValid)
-      return RawText;
-
-    RawText = getRawTextSlow(SourceMgr);
-    RawTextValid = true;
-    return RawText;
-  }
-
-  SourceRange getSourceRange() const LLVM_READONLY {
-    return Range;
-  }
-
-  unsigned getBeginLine(const SourceManager &SM) const;
-  unsigned getEndLine(const SourceManager &SM) const;
-
-private:
-  SourceRange Range;
-
-  mutable StringRef RawText;
-  mutable bool RawTextValid : 1; ///< True if RawText is valid
-
-  unsigned Kind : 3;
-
-  bool IsTrailingComment : 1;
-  bool IsAlmostTrailingComment : 1;
-
-  mutable bool BeginLineValid : 1; ///< True if BeginLine is valid
-  mutable bool EndLineValid : 1;   ///< True if EndLine is valid
-  mutable unsigned BeginLine;      ///< Cached line number
-  mutable unsigned EndLine;        ///< Cached line number
-
-  /// \brief Constructor for AST deserialization.
-  RawComment(SourceRange SR, CommentKind K, bool IsTrailingComment,
-             bool IsAlmostTrailingComment) :
-    Range(SR), RawTextValid(false), Kind(K),
-    IsTrailingComment(IsTrailingComment),
-    IsAlmostTrailingComment(IsAlmostTrailingComment),
-    BeginLineValid(false), EndLineValid(false)
-  { }
-
-  StringRef getRawTextSlow(const SourceManager &SourceMgr) const;
-
-  friend class ASTReader;
-};
-
-/// \brief Compare comments' source locations.
-template<>
-class BeforeThanCompare<RawComment> {
-  const SourceManager &SM;
-
-public:
-  explicit BeforeThanCompare(const SourceManager &SM) : SM(SM) { }
-
-  bool operator()(const RawComment &LHS, const SourceRange &RHS) {
-    return SM.isBeforeInTranslationUnit(LHS.getSourceRange().getBegin(),
-                                        RHS.getBegin());
-  }
-};
-
-/// \brief This class represents all comments included in the translation unit,
-/// sorted in order of appearance in the translation unit.
-class RawCommentList {
-public:
-  RawCommentList(SourceManager &SourceMgr) :
-    SourceMgr(SourceMgr), OnlyWhitespaceSeen(true) { }
-
-  void addComment(const RawComment &RC, ASTContext &Context);
-
-  ArrayRef<RawComment> getComments() const {
-    return Comments;
-  }
-
-private:
-  SourceManager &SourceMgr;
-  std::vector<RawComment> Comments;
-  RawComment LastComment;
-  bool OnlyWhitespaceSeen;
-
-  void addCommentsToFront(const std::vector<RawComment> &C) {
-    size_t OldSize = Comments.size();
-    Comments.resize(C.size() + OldSize);
-    std::copy_backward(Comments.begin(), Comments.begin() + OldSize,
-                       Comments.end());
-    std::copy(C.begin(), C.end(), Comments.begin());
-  }
-
-  friend class ASTReader;
-};
-
-} // end namespace clang
-
-#endif
-

Modified: cfe/trunk/lib/AST/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/CMakeLists.txt?rev=158807&r1=158806&r2=158807&view=diff
==============================================================================
--- cfe/trunk/lib/AST/CMakeLists.txt (original)
+++ cfe/trunk/lib/AST/CMakeLists.txt Wed Jun 20 04:53:52 2012
@@ -35,6 +35,7 @@
   NestedNameSpecifier.cpp
   NSAPI.cpp
   ParentMap.cpp
+  RawCommentList.cpp
   RecordLayout.cpp
   RecordLayoutBuilder.cpp
   SelectorLocationsKind.cpp

Copied: cfe/trunk/lib/AST/RawCommentList.cpp (from r158801, cfe/trunk/lib/Comments/RawCommentList.cpp)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/RawCommentList.cpp?p2=cfe/trunk/lib/AST/RawCommentList.cpp&p1=cfe/trunk/lib/Comments/RawCommentList.cpp&r1=158801&r2=158807&rev=158807&view=diff
==============================================================================
--- cfe/trunk/lib/Comments/RawCommentList.cpp (original)
+++ cfe/trunk/lib/AST/RawCommentList.cpp Wed Jun 20 04:53:52 2012
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Comments/RawCommentList.h"
+#include "clang/AST/RawCommentList.h"
 #include "clang/AST/ASTContext.h"
 #include "llvm/ADT/STLExtras.h"
 

Modified: cfe/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CMakeLists.txt?rev=158807&r1=158806&r2=158807&view=diff
==============================================================================
--- cfe/trunk/lib/CMakeLists.txt (original)
+++ cfe/trunk/lib/CMakeLists.txt Wed Jun 20 04:53:52 2012
@@ -15,4 +15,3 @@
 add_subdirectory(FrontendTool)
 add_subdirectory(Tooling)
 add_subdirectory(StaticAnalyzer)
-add_subdirectory(Comments)

Removed: cfe/trunk/lib/Comments/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Comments/CMakeLists.txt?rev=158806&view=auto
==============================================================================
--- cfe/trunk/lib/Comments/CMakeLists.txt (original)
+++ cfe/trunk/lib/Comments/CMakeLists.txt (removed)
@@ -1,6 +0,0 @@
-set(LLVM_USED_LIBS clangBasic clangAST clangLex)
-
-add_clang_library(clangComments
-  RawCommentList.cpp
-  )
-

Removed: cfe/trunk/lib/Comments/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Comments/Makefile?rev=158806&view=auto
==============================================================================
--- cfe/trunk/lib/Comments/Makefile (original)
+++ cfe/trunk/lib/Comments/Makefile (removed)
@@ -1,14 +0,0 @@
-##===- clang/lib/Comments/Makefile -------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../..
-LIBRARYNAME := clangComments
-
-include $(CLANG_LEVEL)/Makefile
-

Removed: cfe/trunk/lib/Comments/RawCommentList.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Comments/RawCommentList.cpp?rev=158806&view=auto
==============================================================================
--- cfe/trunk/lib/Comments/RawCommentList.cpp (original)
+++ cfe/trunk/lib/Comments/RawCommentList.cpp (removed)
@@ -1,207 +0,0 @@
-//===--- RawCommentList.cpp - Processing raw comments -----------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Comments/RawCommentList.h"
-#include "clang/AST/ASTContext.h"
-#include "llvm/ADT/STLExtras.h"
-
-using namespace clang;
-
-namespace {
-/// Get comment kind and bool describing if it is a trailing comment.
-std::pair<RawComment::CommentKind, bool> getCommentKind(StringRef Comment) {
-  if (Comment.size() < 3 || Comment[0] != '/')
-    return std::make_pair(RawComment::CK_Invalid, false);
-
-  RawComment::CommentKind K;
-  if (Comment[1] == '/') {
-    if (Comment.size() < 3)
-      return std::make_pair(RawComment::CK_OrdinaryBCPL, false);
-
-    if (Comment[2] == '/')
-      K = RawComment::CK_BCPLSlash;
-    else if (Comment[2] == '!')
-      K = RawComment::CK_BCPLExcl;
-    else
-      return std::make_pair(RawComment::CK_OrdinaryBCPL, false);
-  } else {
-    assert(Comment.size() >= 4);
-
-    // Comment lexer does not understand escapes in comment markers, so pretend
-    // that this is not a comment.
-    if (Comment[1] != '*' ||
-        Comment[Comment.size() - 2] != '*' ||
-        Comment[Comment.size() - 1] != '/')
-      return std::make_pair(RawComment::CK_Invalid, false);
-
-    if (Comment[2] == '*')
-      K = RawComment::CK_JavaDoc;
-    else if (Comment[2] == '!')
-      K = RawComment::CK_Qt;
-    else
-      return std::make_pair(RawComment::CK_OrdinaryC, false);
-  }
-  const bool TrailingComment = (Comment.size() > 3) && (Comment[3] == '<');
-  return std::make_pair(K, TrailingComment);
-}
-
-bool mergedCommentIsTrailingComment(StringRef Comment) {
-  return (Comment.size() > 3) && (Comment[3] == '<');
-}
-} // unnamed namespace
-
-RawComment::RawComment(const SourceManager &SourceMgr, SourceRange SR,
-                       bool Merged) :
-    Range(SR), RawTextValid(false), IsAlmostTrailingComment(false),
-    BeginLineValid(false), EndLineValid(false) {
-  // Extract raw comment text, if possible.
-  if (getRawText(SourceMgr).empty()) {
-    Kind = CK_Invalid;
-    return;
-  }
-
-  if (!Merged) {
-    // Guess comment kind.
-    std::pair<CommentKind, bool> K = getCommentKind(RawText);
-    Kind = K.first;
-    IsTrailingComment = K.second;
-
-    IsAlmostTrailingComment = RawText.startswith("//<") ||
-                                 RawText.startswith("/*<");
-  } else {
-    Kind = CK_Merged;
-    IsTrailingComment = mergedCommentIsTrailingComment(RawText);
-  }
-}
-
-unsigned RawComment::getBeginLine(const SourceManager &SM) const {
-  if (BeginLineValid)
-    return BeginLine;
-
-  std::pair<FileID, unsigned> LocInfo = SM.getDecomposedLoc(Range.getBegin());
-  BeginLine = SM.getLineNumber(LocInfo.first, LocInfo.second);
-  BeginLineValid = true;
-  return BeginLine;
-}
-
-unsigned RawComment::getEndLine(const SourceManager &SM) const {
-  if (EndLineValid)
-    return EndLine;
-
-  std::pair<FileID, unsigned> LocInfo = SM.getDecomposedLoc(Range.getEnd());
-  EndLine = SM.getLineNumber(LocInfo.first, LocInfo.second);
-  EndLineValid = true;
-  return EndLine;
-}
-
-StringRef RawComment::getRawTextSlow(const SourceManager &SourceMgr) const {
-  FileID BeginFileID;
-  FileID EndFileID;
-  unsigned BeginOffset;
-  unsigned EndOffset;
-
-  llvm::tie(BeginFileID, BeginOffset) =
-      SourceMgr.getDecomposedLoc(Range.getBegin());
-  llvm::tie(EndFileID, EndOffset) =
-      SourceMgr.getDecomposedLoc(Range.getEnd());
-
-  const unsigned Length = EndOffset - BeginOffset;
-  if (Length < 2)
-    return StringRef();
-
-  // The comment can't begin in one file and end in another.
-  assert(BeginFileID == EndFileID);
-
-  bool Invalid = false;
-  const char *BufferStart = SourceMgr.getBufferData(BeginFileID,
-                                                    &Invalid).data();
-  if (Invalid)
-    return StringRef();
-
-  return StringRef(BufferStart + BeginOffset, Length);
-}
-
-namespace {
-bool containsOnlyWhitespace(StringRef Str) {
-  return Str.find_first_not_of(" \t\f\v\r\n") == StringRef::npos;
-}
-
-bool onlyWhitespaceBetweenComments(SourceManager &SM,
-                                   const RawComment &C1, const RawComment &C2) {
-  std::pair<FileID, unsigned> C1EndLocInfo = SM.getDecomposedLoc(
-                                                C1.getSourceRange().getEnd());
-  std::pair<FileID, unsigned> C2BeginLocInfo = SM.getDecomposedLoc(
-                                              C2.getSourceRange().getBegin());
-
-  // Question does not make sense if comments are located in different files.
-  if (C1EndLocInfo.first != C2BeginLocInfo.first)
-    return false;
-
-  bool Invalid = false;
-  const char *Buffer = SM.getBufferData(C1EndLocInfo.first, &Invalid).data();
-  if (Invalid)
-    return false;
-
-  StringRef TextBetweenComments(Buffer + C1EndLocInfo.second,
-                                C2BeginLocInfo.second - C1EndLocInfo.second);
-
-  return containsOnlyWhitespace(TextBetweenComments);
-}
-} // unnamed namespace
-
-void RawCommentList::addComment(const RawComment &RC, ASTContext &Context) {
-  if (RC.isInvalid())
-    return;
-
-  assert((Comments.empty() ||
-          SourceMgr.isBeforeInTranslationUnit(
-              Comments[0].getSourceRange().getEnd(),
-              RC.getSourceRange().getBegin())) &&
-         "comments are not coming in source order");
-
-  if (OnlyWhitespaceSeen) {
-    if (!onlyWhitespaceBetweenComments(SourceMgr, LastComment, RC))
-      OnlyWhitespaceSeen = false;
-  }
-
-  LastComment = RC;
-
-  // Ordinary comments are not interesting for us.
-  if (RC.isOrdinary())
-    return;
-
-  // If this is the first Doxygen comment, save it (because there isn't
-  // anything to merge it with).
-  if (Comments.empty()) {
-    Comments.push_back(RC);
-    OnlyWhitespaceSeen = true;
-    return;
-  }
-
-  const RawComment &C1 = Comments.back();
-  const RawComment &C2 = RC;
-
-  // Merge comments only if there is only whitespace between them.
-  // Can't merge trailing and non-trailing comments.
-  // Merge trailing comments if they are on same or consecutive lines.
-  if (OnlyWhitespaceSeen &&
-      (C1.isTrailingComment() == C2.isTrailingComment()) &&
-      (!C1.isTrailingComment() ||
-       C1.getEndLine(SourceMgr) + 1 >= C2.getBeginLine(SourceMgr))) {
-    SourceRange MergedRange(C1.getSourceRange().getBegin(),
-                            C2.getSourceRange().getEnd());
-    RawComment Merged(SourceMgr, MergedRange, true);
-    Comments.pop_back();
-    Comments.push_back(Merged);
-  } else
-    Comments.push_back(RC);
-
-  OnlyWhitespaceSeen = true;
-}
-

Modified: cfe/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Makefile?rev=158807&r1=158806&r2=158807&view=diff
==============================================================================
--- cfe/trunk/lib/Makefile (original)
+++ cfe/trunk/lib/Makefile Wed Jun 20 04:53:52 2012
@@ -10,7 +10,7 @@
 
 PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis \
                 StaticAnalyzer Edit Rewrite ARCMigrate Serialization Frontend \
-                FrontendTool Tooling Driver Comments
+                FrontendTool Tooling Driver
 
 include $(CLANG_LEVEL)/Makefile
 

Modified: cfe/trunk/lib/Sema/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/CMakeLists.txt?rev=158807&r1=158806&r2=158807&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/CMakeLists.txt (original)
+++ cfe/trunk/lib/Sema/CMakeLists.txt Wed Jun 20 04:53:52 2012
@@ -4,7 +4,6 @@
   clangBasic
   clangEdit
   clangLex
-  clangComments
   )
 
 add_clang_library(clangSema

Modified: cfe/trunk/tools/arcmt-test/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/arcmt-test/Makefile?rev=158807&r1=158806&r2=158807&view=diff
==============================================================================
--- cfe/trunk/tools/arcmt-test/Makefile (original)
+++ cfe/trunk/tools/arcmt-test/Makefile Wed Jun 20 04:53:52 2012
@@ -19,7 +19,7 @@
 LINK_COMPONENTS := support mc
 USEDLIBS = clangARCMigrate.a clangRewrite.a \
 		 clangFrontend.a clangDriver.a clangSerialization.a clangParse.a \
-		 clangSema.a clangEdit.a clangAnalysis.a clangAST.a clangLex.a clangComments.a \
+		 clangSema.a clangEdit.a clangAnalysis.a clangAST.a clangLex.a \
 		 clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile

Modified: cfe/trunk/tools/c-index-test/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/Makefile?rev=158807&r1=158806&r2=158807&view=diff
==============================================================================
--- cfe/trunk/tools/c-index-test/Makefile (original)
+++ cfe/trunk/tools/c-index-test/Makefile Wed Jun 20 04:53:52 2012
@@ -20,7 +20,7 @@
 LINK_COMPONENTS := support mc
 USEDLIBS = clang.a clangFrontend.a clangDriver.a \
 	   clangSerialization.a clangParse.a clangSema.a \
-	   clangAnalysis.a clangEdit.a clangAST.a clangLex.a clangComments.a \
+	   clangAnalysis.a clangEdit.a clangAST.a clangLex.a \
 	   clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile

Modified: cfe/trunk/tools/clang-check/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-check/CMakeLists.txt?rev=158807&r1=158806&r2=158807&view=diff
==============================================================================
--- cfe/trunk/tools/clang-check/CMakeLists.txt (original)
+++ cfe/trunk/tools/clang-check/CMakeLists.txt Wed Jun 20 04:53:52 2012
@@ -1,4 +1,4 @@
-set(LLVM_USED_LIBS clangTooling clangBasic clangComments)
+set(LLVM_USED_LIBS clangTooling clangBasic)
 
 add_clang_executable(clang-check
   ClangCheck.cpp

Modified: cfe/trunk/tools/clang-check/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-check/Makefile?rev=158807&r1=158806&r2=158807&view=diff
==============================================================================
--- cfe/trunk/tools/clang-check/Makefile (original)
+++ cfe/trunk/tools/clang-check/Makefile Wed Jun 20 04:53:52 2012
@@ -18,7 +18,7 @@
 LINK_COMPONENTS := support mc
 USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \
            clangTooling.a clangParse.a clangSema.a clangAnalysis.a \
-           clangEdit.a clangAST.a clangLex.a clangComments.a clangBasic.a
+           clangEdit.a clangAST.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 

Modified: cfe/trunk/tools/diagtool/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/diagtool/Makefile?rev=158807&r1=158806&r2=158807&view=diff
==============================================================================
--- cfe/trunk/tools/diagtool/Makefile (original)
+++ cfe/trunk/tools/diagtool/Makefile Wed Jun 20 04:53:52 2012
@@ -20,7 +20,7 @@
 
 USEDLIBS = clangFrontend.a clangDriver.a clangSerialization.a clangParse.a \
            clangSema.a clangAnalysis.a clangEdit.a clangAST.a clangLex.a \
-           clangComments.a clangBasic.a
+           clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 

Modified: cfe/trunk/tools/driver/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/Makefile?rev=158807&r1=158806&r2=158807&view=diff
==============================================================================
--- cfe/trunk/tools/driver/Makefile (original)
+++ cfe/trunk/tools/driver/Makefile Wed Jun 20 04:53:52 2012
@@ -36,7 +36,7 @@
            clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
            clangStaticAnalyzerCore.a \
            clangAnalysis.a clangARCMigrate.a clangRewrite.a \
-           clangEdit.a clangAST.a clangLex.a clangComments.a clangBasic.a
+           clangEdit.a clangAST.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 

Modified: cfe/trunk/tools/libclang/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CMakeLists.txt?rev=158807&r1=158806&r2=158807&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/CMakeLists.txt (original)
+++ cfe/trunk/tools/libclang/CMakeLists.txt Wed Jun 20 04:53:52 2012
@@ -6,7 +6,6 @@
   clangSerialization
   clangSema
   clangEdit
-  clangComments
   clangAST
   clangLex
   clangBasic)

Modified: cfe/trunk/tools/libclang/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/Makefile?rev=158807&r1=158806&r2=158807&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/Makefile (original)
+++ cfe/trunk/tools/libclang/Makefile Wed Jun 20 04:53:52 2012
@@ -19,7 +19,7 @@
 USEDLIBS = clangARCMigrate.a clangRewrite.a clangFrontend.a clangDriver.a \
      clangSerialization.a \
 		 clangParse.a clangSema.a clangEdit.a clangAnalysis.a \
-		 clangAST.a clangLex.a clangComments.a clangBasic.a
+		 clangAST.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 

Modified: cfe/trunk/unittests/Frontend/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Frontend/Makefile?rev=158807&r1=158806&r2=158807&view=diff
==============================================================================
--- cfe/trunk/unittests/Frontend/Makefile (original)
+++ cfe/trunk/unittests/Frontend/Makefile Wed Jun 20 04:53:52 2012
@@ -14,6 +14,6 @@
            clangSerialization.a clangCodeGen.a clangParse.a clangSema.a \
            clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a \
            clangARCMigrate.a clangRewrite.a clangEdit.a \
-           clangAnalysis.a clangAST.a clangLex.a clangComments.a clangBasic.a
+           clangAnalysis.a clangAST.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/unittests/Makefile

Modified: cfe/trunk/unittests/Tooling/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Tooling/Makefile?rev=158807&r1=158806&r2=158807&view=diff
==============================================================================
--- cfe/trunk/unittests/Tooling/Makefile (original)
+++ cfe/trunk/unittests/Tooling/Makefile Wed Jun 20 04:53:52 2012
@@ -12,6 +12,6 @@
 LINK_COMPONENTS := support mc
 USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
            clangParse.a clangRewrite.a clangSema.a clangAnalysis.a clangEdit.a \
-           clangAST.a clangLex.a clangComments.a clangBasic.a
+           clangAST.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/unittests/Makefile





More information about the cfe-commits mailing list