<html><head><meta http-equiv="Content-Type" content="text/html charset=iso-8859-1"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">I believe r188850 should fix it.<div><br><div><div>On Aug 20, 2013, at 3:45 PM, Galina Kistanova <<a href="mailto:gkistanova@gmail.com">gkistanova@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div dir="ltr"><pre>>...what version of gcc is this buildbot using ?<br>gcc 4.2.1 20070719 [FreeBSD]<br></pre><pre>here is info on it:<br><a href="http://lab.llvm.org:8011/buildslaves/kistanova7">http://lab.llvm.org:8011/buildslaves/kistanova7</a><br>
<br></pre><pre>Thanks<br><br></pre><pre>Galina <br></pre></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Aug 20, 2013 at 3:26 PM, Argyrios Kyrtzidis <span dir="ltr"><<a href="mailto:akyrtzi@gmail.com" target="_blank">akyrtzi@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 style="word-wrap:break-word"><div><div class="im"><div>On Aug 20, 2013, at 2:33 PM, Galina Kistanova <<a href="mailto:gkistanova@gmail.com" target="_blank">gkistanova@gmail.com</a>> wrote:</div>
<br><blockquote type="cite"><div dir="ltr">Hi Argyrios,<br><br>This commit broke one of builders:<br><a href="http://lab.llvm.org:8011/builders/clang-X86_64-freebsd" target="_blank">http://lab.llvm.org:8011/builders/clang-X86_64-freebsd</a><br>
Please have a look.<br></div></blockquote><div><br></div></div><div>The ambiguity error seems to be a gcc bug, what version of gcc is this buildbot using ?</div><div><div class="h5"><div><br></div><blockquote type="cite">
<div dir="ltr"><div>
<br>Thanks<br><br>Galina<br><br><br>r188600 OK:<br><a href="http://lab.llvm.org:8011/builders/clang-X86_64-freebsd/builds/9927" target="_blank">http://lab.llvm.org:8011/builders/clang-X86_64-freebsd/builds/9927</a><br><br>
</div>188601 fail<br>
<div><a href="http://lab.llvm.org:8011/builders/clang-X86_64-freebsd/builds/9948" target="_blank">http://lab.llvm.org:8011/builders/clang-X86_64-freebsd/builds/9948</a><br></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">
On Fri, Aug 16, 2013 at 5:40 PM, Argyrios Kyrtzidis <span dir="ltr"><<a href="mailto:akyrtzi@gmail.com" target="_blank">akyrtzi@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: akirtzidis<br>
Date: Fri Aug 16 19:40:41 2013<br>
New Revision: 188601<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=188601&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=188601&view=rev</a><br>
Log:<br>
Rename libIDE to libIndex.<br>
<br>
Per feedback from Chandler, it's better to have libraries with more specific functionality.<br>
LibIndex will contain the indexing functionality of libclang, which includes USR generation.<br>
<br>
Added:<br>
cfe/trunk/include/clang/Index/<br>
cfe/trunk/include/clang/Index/USRGeneration.h<br>
- copied, changed from r188600, cfe/trunk/include/clang/IDE/USRGeneration.h<br>
cfe/trunk/lib/Index/<br>
cfe/trunk/lib/Index/CMakeLists.txt<br>
cfe/trunk/lib/Index/Makefile<br>
- copied, changed from r188600, cfe/trunk/lib/IDE/Makefile<br>
cfe/trunk/lib/Index/USRGeneration.cpp<br>
- copied, changed from r188600, cfe/trunk/lib/IDE/USRGeneration.cpp<br>
Removed:<br>
cfe/trunk/include/clang/IDE/USRGeneration.h<br>
cfe/trunk/lib/IDE/CMakeLists.txt<br>
cfe/trunk/lib/IDE/Makefile<br>
cfe/trunk/lib/IDE/USRGeneration.cpp<br>
Modified:<br>
cfe/trunk/lib/CMakeLists.txt<br>
cfe/trunk/lib/Makefile<br>
cfe/trunk/tools/libclang/CIndexUSRs.cpp<br>
cfe/trunk/tools/libclang/CMakeLists.txt<br>
cfe/trunk/tools/libclang/Makefile<br>
<br>
Removed: cfe/trunk/include/clang/IDE/USRGeneration.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/IDE/USRGeneration.h?rev=188600&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/IDE/USRGeneration.h?rev=188600&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/IDE/USRGeneration.h (original)<br>
+++ cfe/trunk/include/clang/IDE/USRGeneration.h (removed)<br>
@@ -1,54 +0,0 @@<br>
-//===- USRGeneration.h - Routines for USR generation ----------------------===//<br>
-//<br>
-// The LLVM Compiler Infrastructure<br>
-//<br>
-// This file is distributed under the University of Illinois Open Source<br>
-// License. See LICENSE.TXT for details.<br>
-//<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-#ifndef LLVM_CLANG_IDE_USRGENERATION_H<br>
-#define LLVM_CLANG_IDE_USRGENERATION_H<br>
-<br>
-#include "clang/Basic/LLVM.h"<br>
-#include "llvm/ADT/StringRef.h"<br>
-<br>
-namespace clang {<br>
- class Decl;<br>
-<br>
-namespace ide {<br>
-<br>
-static inline StringRef getUSRSpacePrefix() {<br>
- return "c:";<br>
-}<br>
-<br>
-/// \brief Generate a USR for a Decl, including the prefix.<br>
-/// \returns true if the results should be ignored, false otherwise.<br>
-bool generateUSRForDecl(const Decl *D, SmallVectorImpl<char> &Buf);<br>
-<br>
-/// \brief Generate a USR fragment for an Objective-C class.<br>
-void generateUSRForObjCClass(StringRef Cls, raw_ostream &OS);<br>
-<br>
-/// \brief Generate a USR fragment for an Objective-C class category.<br>
-void generateUSRForObjCCategory(StringRef Cls, StringRef Cat, raw_ostream &OS);<br>
-<br>
-/// \brief Generate a USR fragment for an Objective-C instance variable. The<br>
-/// complete USR can be created by concatenating the USR for the<br>
-/// encompassing class with this USR fragment.<br>
-void generateUSRForObjCIvar(StringRef Ivar, raw_ostream &OS);<br>
-<br>
-/// \brief Generate a USR fragment for an Objective-C method.<br>
-void generateUSRForObjCMethod(StringRef Sel, bool IsInstanceMethod,<br>
- raw_ostream &OS);<br>
-<br>
-/// \brief Generate a USR fragment for an Objective-C property.<br>
-void generateUSRForObjCProperty(StringRef Prop, raw_ostream &OS);<br>
-<br>
-/// \brief Generate a USR fragment for an Objective-C protocol.<br>
-void generateUSRForObjCProtocol(StringRef Prot, raw_ostream &OS);<br>
-<br>
-} // namespace ide<br>
-} // namespace clang<br>
-<br>
-#endif // LLVM_CLANG_IDE_USRGENERATION_H<br>
-<br>
<br>
Copied: cfe/trunk/include/clang/Index/USRGeneration.h (from r188600, cfe/trunk/include/clang/IDE/USRGeneration.h)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Index/USRGeneration.h?p2=cfe/trunk/include/clang/Index/USRGeneration.h&p1=cfe/trunk/include/clang/IDE/USRGeneration.h&r1=188600&r2=188601&rev=188601&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Index/USRGeneration.h?p2=cfe/trunk/include/clang/Index/USRGeneration.h&p1=cfe/trunk/include/clang/IDE/USRGeneration.h&r1=188600&r2=188601&rev=188601&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/IDE/USRGeneration.h (original)<br>
+++ cfe/trunk/include/clang/Index/USRGeneration.h Fri Aug 16 19:40:41 2013<br>
@@ -7,8 +7,8 @@<br>
//<br>
//===----------------------------------------------------------------------===//<br>
<br>
-#ifndef LLVM_CLANG_IDE_USRGENERATION_H<br>
-#define LLVM_CLANG_IDE_USRGENERATION_H<br>
+#ifndef LLVM_CLANG_INDEX_USRGENERATION_H<br>
+#define LLVM_CLANG_INDEX_USRGENERATION_H<br>
<br>
#include "clang/Basic/LLVM.h"<br>
#include "llvm/ADT/StringRef.h"<br>
@@ -16,7 +16,7 @@<br>
namespace clang {<br>
class Decl;<br>
<br>
-namespace ide {<br>
+namespace index {<br>
<br>
static inline StringRef getUSRSpacePrefix() {<br>
return "c:";<br>
<br>
Modified: cfe/trunk/lib/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CMakeLists.txt?rev=188601&r1=188600&r2=188601&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CMakeLists.txt?rev=188601&r1=188600&r2=188601&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CMakeLists.txt (original)<br>
+++ cfe/trunk/lib/CMakeLists.txt Fri Aug 16 19:40:41 2013<br>
@@ -17,7 +17,7 @@ add_subdirectory(Serialization)<br>
add_subdirectory(Frontend)<br>
add_subdirectory(FrontendTool)<br>
add_subdirectory(Tooling)<br>
-add_subdirectory(IDE)<br>
+add_subdirectory(Index)<br>
if(CLANG_ENABLE_STATIC_ANALYZER)<br>
add_subdirectory(StaticAnalyzer)<br>
endif()<br>
<br>
Removed: cfe/trunk/lib/IDE/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/IDE/CMakeLists.txt?rev=188600&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/IDE/CMakeLists.txt?rev=188600&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/lib/IDE/CMakeLists.txt (original)<br>
+++ cfe/trunk/lib/IDE/CMakeLists.txt (removed)<br>
@@ -1,8 +0,0 @@<br>
-add_clang_library(clangIDE<br>
- USRGeneration.cpp<br>
- )<br>
-<br>
-target_link_libraries(clangIDE<br>
- clangBasic<br>
- clangAST<br>
- )<br>
<br>
Removed: cfe/trunk/lib/IDE/Makefile<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/IDE/Makefile?rev=188600&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/IDE/Makefile?rev=188600&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/lib/IDE/Makefile (original)<br>
+++ cfe/trunk/lib/IDE/Makefile (removed)<br>
@@ -1,13 +0,0 @@<br>
-##===- clang/lib/IDE/Makefile ------------------------------*- Makefile -*-===##<br>
-#<br>
-# The LLVM Compiler Infrastructure<br>
-#<br>
-# This file is distributed under the University of Illinois Open Source<br>
-# License. See LICENSE.TXT for details.<br>
-#<br>
-##===----------------------------------------------------------------------===##<br>
-<br>
-CLANG_LEVEL := ../..<br>
-LIBRARYNAME := clangIDE<br>
-<br>
-include $(CLANG_LEVEL)/Makefile<br>
<br>
Removed: cfe/trunk/lib/IDE/USRGeneration.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/IDE/USRGeneration.cpp?rev=188600&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/IDE/USRGeneration.cpp?rev=188600&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/lib/IDE/USRGeneration.cpp (original)<br>
+++ cfe/trunk/lib/IDE/USRGeneration.cpp (removed)<br>
@@ -1,800 +0,0 @@<br>
-//===- USRGeneration.cpp - Routines for USR generation --------------------===//<br>
-//<br>
-// The LLVM Compiler Infrastructure<br>
-//<br>
-// This file is distributed under the University of Illinois Open Source<br>
-// License. See LICENSE.TXT for details.<br>
-//<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-#include "clang/IDE/USRGeneration.h"<br>
-#include "clang/AST/ASTContext.h"<br>
-#include "clang/AST/DeclTemplate.h"<br>
-#include "clang/AST/DeclVisitor.h"<br>
-#include "llvm/ADT/SmallString.h"<br>
-#include "llvm/Support/Path.h"<br>
-#include "llvm/Support/raw_ostream.h"<br>
-<br>
-using namespace clang;<br>
-<br>
-//===----------------------------------------------------------------------===//<br>
-// USR generation.<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-namespace {<br>
-class USRGenerator : public ConstDeclVisitor<USRGenerator> {<br>
- SmallVectorImpl<char> &Buf;<br>
- llvm::raw_svector_ostream Out;<br>
- bool IgnoreResults;<br>
- ASTContext *Context;<br>
- bool generatedLoc;<br>
-<br>
- llvm::DenseMap<const Type *, unsigned> TypeSubstitutions;<br>
-<br>
-public:<br>
- explicit USRGenerator(ASTContext *Ctx, SmallVectorImpl<char> &Buf)<br>
- : Buf(Buf),<br>
- Out(Buf),<br>
- IgnoreResults(false),<br>
- Context(Ctx),<br>
- generatedLoc(false)<br>
- {<br>
- // Add the USR space prefix.<br>
- Out << ide::getUSRSpacePrefix();<br>
- }<br>
-<br>
- bool ignoreResults() const { return IgnoreResults; }<br>
-<br>
- // Visitation methods from generating USRs from AST elements.<br>
- void VisitDeclContext(const DeclContext *D);<br>
- void VisitFieldDecl(const FieldDecl *D);<br>
- void VisitFunctionDecl(const FunctionDecl *D);<br>
- void VisitNamedDecl(const NamedDecl *D);<br>
- void VisitNamespaceDecl(const NamespaceDecl *D);<br>
- void VisitNamespaceAliasDecl(const NamespaceAliasDecl *D);<br>
- void VisitFunctionTemplateDecl(const FunctionTemplateDecl *D);<br>
- void VisitClassTemplateDecl(const ClassTemplateDecl *D);<br>
- void VisitObjCContainerDecl(const ObjCContainerDecl *CD);<br>
- void VisitObjCMethodDecl(const ObjCMethodDecl *MD);<br>
- void VisitObjCPropertyDecl(const ObjCPropertyDecl *D);<br>
- void VisitObjCPropertyImplDecl(const ObjCPropertyImplDecl *D);<br>
- void VisitTagDecl(const TagDecl *D);<br>
- void VisitTypedefDecl(const TypedefDecl *D);<br>
- void VisitTemplateTypeParmDecl(const TemplateTypeParmDecl *D);<br>
- void VisitVarDecl(const VarDecl *D);<br>
- void VisitNonTypeTemplateParmDecl(const NonTypeTemplateParmDecl *D);<br>
- void VisitTemplateTemplateParmDecl(const TemplateTemplateParmDecl *D);<br>
- void VisitLinkageSpecDecl(const LinkageSpecDecl *D) {<br>
- IgnoreResults = true;<br>
- }<br>
- void VisitUsingDirectiveDecl(const UsingDirectiveDecl *D) {<br>
- IgnoreResults = true;<br>
- }<br>
- void VisitUsingDecl(const UsingDecl *D) {<br>
- IgnoreResults = true;<br>
- }<br>
- void VisitUnresolvedUsingValueDecl(const UnresolvedUsingValueDecl *D) {<br>
- IgnoreResults = true;<br>
- }<br>
- void VisitUnresolvedUsingTypenameDecl(const UnresolvedUsingTypenameDecl *D) {<br>
- IgnoreResults = true;<br>
- }<br>
-<br>
- /// Generate the string component containing the location of the<br>
- /// declaration.<br>
- bool GenLoc(const Decl *D);<br>
-<br>
- /// String generation methods used both by the visitation methods<br>
- /// and from other clients that want to directly generate USRs. These<br>
- /// methods do not construct complete USRs (which incorporate the parents<br>
- /// of an AST element), but only the fragments concerning the AST element<br>
- /// itself.<br>
-<br>
- /// Generate a USR for an Objective-C class.<br>
- void GenObjCClass(StringRef cls) {<br>
- ide::generateUSRForObjCClass(cls, Out);<br>
- }<br>
- /// Generate a USR for an Objective-C class category.<br>
- void GenObjCCategory(StringRef cls, StringRef cat) {<br>
- ide::generateUSRForObjCCategory(cls, cat, Out);<br>
- }<br>
- /// Generate a USR fragment for an Objective-C instance variable. The<br>
- /// complete USR can be created by concatenating the USR for the<br>
- /// encompassing class with this USR fragment.<br>
- void GenObjCIvar(StringRef ivar) {<br>
- ide::generateUSRForObjCIvar(ivar, Out);<br>
- }<br>
- /// Generate a USR fragment for an Objective-C method.<br>
- void GenObjCMethod(StringRef sel, bool isInstanceMethod) {<br>
- ide::generateUSRForObjCMethod(sel, isInstanceMethod, Out);<br>
- }<br>
- /// Generate a USR fragment for an Objective-C property.<br>
- void GenObjCProperty(StringRef prop) {<br>
- ide::generateUSRForObjCProperty(prop, Out);<br>
- }<br>
- /// Generate a USR for an Objective-C protocol.<br>
- void GenObjCProtocol(StringRef prot) {<br>
- ide::generateUSRForObjCProtocol(prot, Out);<br>
- }<br>
-<br>
- void VisitType(QualType T);<br>
- void VisitTemplateParameterList(const TemplateParameterList *Params);<br>
- void VisitTemplateName(TemplateName Name);<br>
- void VisitTemplateArgument(const TemplateArgument &Arg);<br>
-<br>
- /// Emit a Decl's name using NamedDecl::printName() and return true if<br>
- /// the decl had no name.<br>
- bool EmitDeclName(const NamedDecl *D);<br>
-};<br>
-<br>
-} // end anonymous namespace<br>
-<br>
-//===----------------------------------------------------------------------===//<br>
-// Generating USRs from ASTS.<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-bool USRGenerator::EmitDeclName(const NamedDecl *D) {<br>
- Out.flush();<br>
- const unsigned startSize = Buf.size();<br>
- D->printName(Out);<br>
- Out.flush();<br>
- const unsigned endSize = Buf.size();<br>
- return startSize == endSize;<br>
-}<br>
-<br>
-static inline bool ShouldGenerateLocation(const NamedDecl *D) {<br>
- return !D->isExternallyVisible();<br>
-}<br>
-<br>
-void USRGenerator::VisitDeclContext(const DeclContext *DC) {<br>
- if (const NamedDecl *D = dyn_cast<NamedDecl>(DC))<br>
- Visit(D);<br>
-}<br>
-<br>
-void USRGenerator::VisitFieldDecl(const FieldDecl *D) {<br>
- // The USR for an ivar declared in a class extension is based on the<br>
- // ObjCInterfaceDecl, not the ObjCCategoryDecl.<br>
- if (const ObjCInterfaceDecl *ID = Context->getObjContainingInterface(D))<br>
- Visit(ID);<br>
- else<br>
- VisitDeclContext(D->getDeclContext());<br>
- Out << (isa<ObjCIvarDecl>(D) ? "@" : "@FI@");<br>
- if (EmitDeclName(D)) {<br>
- // Bit fields can be anonymous.<br>
- IgnoreResults = true;<br>
- return;<br>
- }<br>
-}<br>
-<br>
-void USRGenerator::VisitFunctionDecl(const FunctionDecl *D) {<br>
- if (ShouldGenerateLocation(D) && GenLoc(D))<br>
- return;<br>
-<br>
- VisitDeclContext(D->getDeclContext());<br>
- if (FunctionTemplateDecl *FunTmpl = D->getDescribedFunctionTemplate()) {<br>
- Out << "@FT@";<br>
- VisitTemplateParameterList(FunTmpl->getTemplateParameters());<br>
- } else<br>
- Out << "@F@";<br>
- D->printName(Out);<br>
-<br>
- ASTContext &Ctx = *Context;<br>
- if (!Ctx.getLangOpts().CPlusPlus || D->isExternC())<br>
- return;<br>
-<br>
- if (const TemplateArgumentList *<br>
- SpecArgs = D->getTemplateSpecializationArgs()) {<br>
- Out << '<';<br>
- for (unsigned I = 0, N = SpecArgs->size(); I != N; ++I) {<br>
- Out << '#';<br>
- VisitTemplateArgument(SpecArgs->get(I));<br>
- }<br>
- Out << '>';<br>
- }<br>
-<br>
- // Mangle in type information for the arguments.<br>
- for (FunctionDecl::param_const_iterator I = D->param_begin(),<br>
- E = D->param_end();<br>
- I != E; ++I) {<br>
- Out << '#';<br>
- if (ParmVarDecl *PD = *I)<br>
- VisitType(PD->getType());<br>
- }<br>
- if (D->isVariadic())<br>
- Out << '.';<br>
- Out << '#';<br>
- if (const CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(D)) {<br>
- if (MD->isStatic())<br>
- Out << 'S';<br>
- if (unsigned quals = MD->getTypeQualifiers())<br>
- Out << (char)('0' + quals);<br>
- }<br>
-}<br>
-<br>
-void USRGenerator::VisitNamedDecl(const NamedDecl *D) {<br>
- VisitDeclContext(D->getDeclContext());<br>
- Out << "@";<br>
-<br>
- if (EmitDeclName(D)) {<br>
- // The string can be empty if the declaration has no name; e.g., it is<br>
- // the ParmDecl with no name for declaration of a function pointer type,<br>
- // e.g.: void (*f)(void *);<br>
- // In this case, don't generate a USR.<br>
- IgnoreResults = true;<br>
- }<br>
-}<br>
-<br>
-void USRGenerator::VisitVarDecl(const VarDecl *D) {<br>
- // VarDecls can be declared 'extern' within a function or method body,<br>
- // but their enclosing DeclContext is the function, not the TU. We need<br>
- // to check the storage class to correctly generate the USR.<br>
- if (ShouldGenerateLocation(D) && GenLoc(D))<br>
- return;<br>
-<br>
- VisitDeclContext(D->getDeclContext());<br>
-<br>
- // Variables always have simple names.<br>
- StringRef s = D->getName();<br>
-<br>
- // The string can be empty if the declaration has no name; e.g., it is<br>
- // the ParmDecl with no name for declaration of a function pointer type, e.g.:<br>
- // void (*f)(void *);<br>
- // In this case, don't generate a USR.<br>
- if (s.empty())<br>
- IgnoreResults = true;<br>
- else<br>
- Out << '@' << s;<br>
-}<br>
-<br>
-void USRGenerator::VisitNonTypeTemplateParmDecl(<br>
- const NonTypeTemplateParmDecl *D) {<br>
- GenLoc(D);<br>
- return;<br>
-}<br>
-<br>
-void USRGenerator::VisitTemplateTemplateParmDecl(<br>
- const TemplateTemplateParmDecl *D) {<br>
- GenLoc(D);<br>
- return;<br>
-}<br>
-<br>
-void USRGenerator::VisitNamespaceDecl(const NamespaceDecl *D) {<br>
- if (D->isAnonymousNamespace()) {<br>
- Out << "@aN";<br>
- return;<br>
- }<br>
-<br>
- VisitDeclContext(D->getDeclContext());<br>
- if (!IgnoreResults)<br>
- Out << "@N@" << D->getName();<br>
-}<br>
-<br>
-void USRGenerator::VisitFunctionTemplateDecl(const FunctionTemplateDecl *D) {<br>
- VisitFunctionDecl(D->getTemplatedDecl());<br>
-}<br>
-<br>
-void USRGenerator::VisitClassTemplateDecl(const ClassTemplateDecl *D) {<br>
- VisitTagDecl(D->getTemplatedDecl());<br>
-}<br>
-<br>
-void USRGenerator::VisitNamespaceAliasDecl(const NamespaceAliasDecl *D) {<br>
- VisitDeclContext(D->getDeclContext());<br>
- if (!IgnoreResults)<br>
- Out << "@NA@" << D->getName();<br>
-}<br>
-<br>
-void USRGenerator::VisitObjCMethodDecl(const ObjCMethodDecl *D) {<br>
- const DeclContext *container = D->getDeclContext();<br>
- if (const ObjCProtocolDecl *pd = dyn_cast<ObjCProtocolDecl>(container)) {<br>
- Visit(pd);<br>
- }<br>
- else {<br>
- // The USR for a method declared in a class extension or category is based on<br>
- // the ObjCInterfaceDecl, not the ObjCCategoryDecl.<br>
- const ObjCInterfaceDecl *ID = D->getClassInterface();<br>
- if (!ID) {<br>
- IgnoreResults = true;<br>
- return;<br>
- }<br>
- Visit(ID);<br>
- }<br>
- // Ideally we would use 'GenObjCMethod', but this is such a hot path<br>
- // for Objective-C code that we don't want to use<br>
- // DeclarationName::getAsString().<br>
- Out << (D->isInstanceMethod() ? "(im)" : "(cm)")<br>
- << DeclarationName(D->getSelector());<br>
-}<br>
-<br>
-void USRGenerator::VisitObjCContainerDecl(const ObjCContainerDecl *D) {<br>
- switch (D->getKind()) {<br>
- default:<br>
- llvm_unreachable("Invalid ObjC container.");<br>
- case Decl::ObjCInterface:<br>
- case Decl::ObjCImplementation:<br>
- GenObjCClass(D->getName());<br>
- break;<br>
- case Decl::ObjCCategory: {<br>
- const ObjCCategoryDecl *CD = cast<ObjCCategoryDecl>(D);<br>
- const ObjCInterfaceDecl *ID = CD->getClassInterface();<br>
- if (!ID) {<br>
- // Handle invalid code where the @interface might not<br>
- // have been specified.<br>
- // FIXME: We should be able to generate this USR even if the<br>
- // @interface isn't available.<br>
- IgnoreResults = true;<br>
- return;<br>
- }<br>
- // Specially handle class extensions, which are anonymous categories.<br>
- // We want to mangle in the location to uniquely distinguish them.<br>
- if (CD->IsClassExtension()) {<br>
- Out << "objc(ext)" << ID->getName() << '@';<br>
- GenLoc(CD);<br>
- }<br>
- else<br>
- GenObjCCategory(ID->getName(), CD->getName());<br>
-<br>
- break;<br>
- }<br>
- case Decl::ObjCCategoryImpl: {<br>
- const ObjCCategoryImplDecl *CD = cast<ObjCCategoryImplDecl>(D);<br>
- const ObjCInterfaceDecl *ID = CD->getClassInterface();<br>
- if (!ID) {<br>
- // Handle invalid code where the @interface might not<br>
- // have been specified.<br>
- // FIXME: We should be able to generate this USR even if the<br>
- // @interface isn't available.<br>
- IgnoreResults = true;<br>
- return;<br>
- }<br>
- GenObjCCategory(ID->getName(), CD->getName());<br>
- break;<br>
- }<br>
- case Decl::ObjCProtocol:<br>
- GenObjCProtocol(cast<ObjCProtocolDecl>(D)->getName());<br>
- break;<br>
- }<br>
-}<br>
-<br>
-void USRGenerator::VisitObjCPropertyDecl(const ObjCPropertyDecl *D) {<br>
- // The USR for a property declared in a class extension or category is based<br>
- // on the ObjCInterfaceDecl, not the ObjCCategoryDecl.<br>
- if (const ObjCInterfaceDecl *ID = Context->getObjContainingInterface(D))<br>
- Visit(ID);<br>
- else<br>
- Visit(cast<Decl>(D->getDeclContext()));<br>
- GenObjCProperty(D->getName());<br>
-}<br>
-<br>
-void USRGenerator::VisitObjCPropertyImplDecl(const ObjCPropertyImplDecl *D) {<br>
- if (ObjCPropertyDecl *PD = D->getPropertyDecl()) {<br>
- VisitObjCPropertyDecl(PD);<br>
- return;<br>
- }<br>
-<br>
- IgnoreResults = true;<br>
-}<br>
-<br>
-void USRGenerator::VisitTagDecl(const TagDecl *D) {<br>
- // Add the location of the tag decl to handle resolution across<br>
- // translation units.<br>
- if (ShouldGenerateLocation(D) && GenLoc(D))<br>
- return;<br>
-<br>
- D = D->getCanonicalDecl();<br>
- VisitDeclContext(D->getDeclContext());<br>
-<br>
- bool AlreadyStarted = false;<br>
- if (const CXXRecordDecl *CXXRecord = dyn_cast<CXXRecordDecl>(D)) {<br>
- if (ClassTemplateDecl *ClassTmpl = CXXRecord->getDescribedClassTemplate()) {<br>
- AlreadyStarted = true;<br>
-<br>
- switch (D->getTagKind()) {<br>
- case TTK_Interface:<br>
- case TTK_Struct: Out << "@ST"; break;<br>
- case TTK_Class: Out << "@CT"; break;<br>
- case TTK_Union: Out << "@UT"; break;<br>
- case TTK_Enum: llvm_unreachable("enum template");<br>
- }<br>
- VisitTemplateParameterList(ClassTmpl->getTemplateParameters());<br>
- } else if (const ClassTemplatePartialSpecializationDecl *PartialSpec<br>
- = dyn_cast<ClassTemplatePartialSpecializationDecl>(CXXRecord)) {<br>
- AlreadyStarted = true;<br>
-<br>
- switch (D->getTagKind()) {<br>
- case TTK_Interface:<br>
- case TTK_Struct: Out << "@SP"; break;<br>
- case TTK_Class: Out << "@CP"; break;<br>
- case TTK_Union: Out << "@UP"; break;<br>
- case TTK_Enum: llvm_unreachable("enum partial specialization");<br>
- }<br>
- VisitTemplateParameterList(PartialSpec->getTemplateParameters());<br>
- }<br>
- }<br>
-<br>
- if (!AlreadyStarted) {<br>
- switch (D->getTagKind()) {<br>
- case TTK_Interface:<br>
- case TTK_Struct: Out << "@S"; break;<br>
- case TTK_Class: Out << "@C"; break;<br>
- case TTK_Union: Out << "@U"; break;<br>
- case TTK_Enum: Out << "@E"; break;<br>
- }<br>
- }<br>
-<br>
- Out << '@';<br>
- Out.flush();<br>
- assert(Buf.size() > 0);<br>
- const unsigned off = Buf.size() - 1;<br>
-<br>
- if (EmitDeclName(D)) {<br>
- if (const TypedefNameDecl *TD = D->getTypedefNameForAnonDecl()) {<br>
- Buf[off] = 'A';<br>
- Out << '@' << *TD;<br>
- }<br>
- else<br>
- Buf[off] = 'a';<br>
- }<br>
-<br>
- // For a class template specialization, mangle the template arguments.<br>
- if (const ClassTemplateSpecializationDecl *Spec<br>
- = dyn_cast<ClassTemplateSpecializationDecl>(D)) {<br>
- const TemplateArgumentList &Args = Spec->getTemplateInstantiationArgs();<br>
- Out << '>';<br>
- for (unsigned I = 0, N = Args.size(); I != N; ++I) {<br>
- Out << '#';<br>
- VisitTemplateArgument(Args.get(I));<br>
- }<br>
- }<br>
-}<br>
-<br>
-void USRGenerator::VisitTypedefDecl(const TypedefDecl *D) {<br>
- if (ShouldGenerateLocation(D) && GenLoc(D))<br>
- return;<br>
- const DeclContext *DC = D->getDeclContext();<br>
- if (const NamedDecl *DCN = dyn_cast<NamedDecl>(DC))<br>
- Visit(DCN);<br>
- Out << "@T@";<br>
- Out << D->getName();<br>
-}<br>
-<br>
-void USRGenerator::VisitTemplateTypeParmDecl(const TemplateTypeParmDecl *D) {<br>
- GenLoc(D);<br>
- return;<br>
-}<br>
-<br>
-bool USRGenerator::GenLoc(const Decl *D) {<br>
- if (generatedLoc)<br>
- return IgnoreResults;<br>
- generatedLoc = true;<br>
-<br>
- // Guard against null declarations in invalid code.<br>
- if (!D) {<br>
- IgnoreResults = true;<br>
- return true;<br>
- }<br>
-<br>
- // Use the location of canonical decl.<br>
- D = D->getCanonicalDecl();<br>
-<br>
- const SourceManager &SM = Context->getSourceManager();<br>
- SourceLocation L = D->getLocStart();<br>
- if (L.isInvalid()) {<br>
- IgnoreResults = true;<br>
- return true;<br>
- }<br>
- L = SM.getExpansionLoc(L);<br>
- const std::pair<FileID, unsigned> &Decomposed = SM.getDecomposedLoc(L);<br>
- const FileEntry *FE = SM.getFileEntryForID(Decomposed.first);<br>
- if (FE) {<br>
- Out << llvm::sys::path::filename(FE->getName());<br>
- }<br>
- else {<br>
- // This case really isn't interesting.<br>
- IgnoreResults = true;<br>
- return true;<br>
- }<br>
- // Use the offest into the FileID to represent the location. Using<br>
- // a line/column can cause us to look back at the original source file,<br>
- // which is expensive.<br>
- Out << '@' << Decomposed.second;<br>
- return IgnoreResults;<br>
-}<br>
-<br>
-void USRGenerator::VisitType(QualType T) {<br>
- // This method mangles in USR information for types. It can possibly<br>
- // just reuse the naming-mangling logic used by codegen, although the<br>
- // requirements for USRs might not be the same.<br>
- ASTContext &Ctx = *Context;<br>
-<br>
- do {<br>
- T = Ctx.getCanonicalType(T);<br>
- Qualifiers Q = T.getQualifiers();<br>
- unsigned qVal = 0;<br>
- if (Q.hasConst())<br>
- qVal |= 0x1;<br>
- if (Q.hasVolatile())<br>
- qVal |= 0x2;<br>
- if (Q.hasRestrict())<br>
- qVal |= 0x4;<br>
- if(qVal)<br>
- Out << ((char) ('0' + qVal));<br>
-<br>
- // Mangle in ObjC GC qualifiers?<br>
-<br>
- if (const PackExpansionType *Expansion = T->getAs<PackExpansionType>()) {<br>
- Out << 'P';<br>
- T = Expansion->getPattern();<br>
- }<br>
-<br>
- if (const BuiltinType *BT = T->getAs<BuiltinType>()) {<br>
- unsigned char c = '\0';<br>
- switch (BT->getKind()) {<br>
- case BuiltinType::Void:<br>
- c = 'v'; break;<br>
- case BuiltinType::Bool:<br>
- c = 'b'; break;<br>
- case BuiltinType::Char_U:<br>
- case BuiltinType::UChar:<br>
- c = 'c'; break;<br>
- case BuiltinType::Char16:<br>
- c = 'q'; break;<br>
- case BuiltinType::Char32:<br>
- c = 'w'; break;<br>
- case BuiltinType::UShort:<br>
- c = 's'; break;<br>
- case BuiltinType::UInt:<br>
- c = 'i'; break;<br>
- case BuiltinType::ULong:<br>
- c = 'l'; break;<br>
- case BuiltinType::ULongLong:<br>
- c = 'k'; break;<br>
- case BuiltinType::UInt128:<br>
- c = 'j'; break;<br>
- case BuiltinType::Char_S:<br>
- case BuiltinType::SChar:<br>
- c = 'C'; break;<br>
- case BuiltinType::WChar_S:<br>
- case BuiltinType::WChar_U:<br>
- c = 'W'; break;<br>
- case BuiltinType::Short:<br>
- c = 'S'; break;<br>
- case BuiltinType::Int:<br>
- c = 'I'; break;<br>
- case BuiltinType::Long:<br>
- c = 'L'; break;<br>
- case BuiltinType::LongLong:<br>
- c = 'K'; break;<br>
- case BuiltinType::Int128:<br>
- c = 'J'; break;<br>
- case BuiltinType::Half:<br>
- c = 'h'; break;<br>
- case BuiltinType::Float:<br>
- c = 'f'; break;<br>
- case BuiltinType::Double:<br>
- c = 'd'; break;<br>
- case BuiltinType::LongDouble:<br>
- c = 'D'; break;<br>
- case BuiltinType::NullPtr:<br>
- c = 'n'; break;<br>
-#define BUILTIN_TYPE(Id, SingletonId)<br>
-#define PLACEHOLDER_TYPE(Id, SingletonId) case BuiltinType::Id:<br>
-#include "clang/AST/BuiltinTypes.def"<br>
- case BuiltinType::Dependent:<br>
- case BuiltinType::OCLImage1d:<br>
- case BuiltinType::OCLImage1dArray:<br>
- case BuiltinType::OCLImage1dBuffer:<br>
- case BuiltinType::OCLImage2d:<br>
- case BuiltinType::OCLImage2dArray:<br>
- case BuiltinType::OCLImage3d:<br>
- case BuiltinType::OCLEvent:<br>
- case BuiltinType::OCLSampler:<br>
- IgnoreResults = true;<br>
- return;<br>
- case BuiltinType::ObjCId:<br>
- c = 'o'; break;<br>
- case BuiltinType::ObjCClass:<br>
- c = 'O'; break;<br>
- case BuiltinType::ObjCSel:<br>
- c = 'e'; break;<br>
- }<br>
- Out << c;<br>
- return;<br>
- }<br>
-<br>
- // If we have already seen this (non-built-in) type, use a substitution<br>
- // encoding.<br>
- llvm::DenseMap<const Type *, unsigned>::iterator Substitution<br>
- = TypeSubstitutions.find(T.getTypePtr());<br>
- if (Substitution != TypeSubstitutions.end()) {<br>
- Out << 'S' << Substitution->second << '_';<br>
- return;<br>
- } else {<br>
- // Record this as a substitution.<br>
- unsigned Number = TypeSubstitutions.size();<br>
- TypeSubstitutions[T.getTypePtr()] = Number;<br>
- }<br>
-<br>
- if (const PointerType *PT = T->getAs<PointerType>()) {<br>
- Out << '*';<br>
- T = PT->getPointeeType();<br>
- continue;<br>
- }<br>
- if (const ReferenceType *RT = T->getAs<ReferenceType>()) {<br>
- Out << '&';<br>
- T = RT->getPointeeType();<br>
- continue;<br>
- }<br>
- if (const FunctionProtoType *FT = T->getAs<FunctionProtoType>()) {<br>
- Out << 'F';<br>
- VisitType(FT->getResultType());<br>
- for (FunctionProtoType::arg_type_iterator<br>
- I = FT->arg_type_begin(), E = FT->arg_type_end(); I!=E; ++I) {<br>
- VisitType(*I);<br>
- }<br>
- if (FT->isVariadic())<br>
- Out << '.';<br>
- return;<br>
- }<br>
- if (const BlockPointerType *BT = T->getAs<BlockPointerType>()) {<br>
- Out << 'B';<br>
- T = BT->getPointeeType();<br>
- continue;<br>
- }<br>
- if (const ComplexType *CT = T->getAs<ComplexType>()) {<br>
- Out << '<';<br>
- T = CT->getElementType();<br>
- continue;<br>
- }<br>
- if (const TagType *TT = T->getAs<TagType>()) {<br>
- Out << '$';<br>
- VisitTagDecl(TT->getDecl());<br>
- return;<br>
- }<br>
- if (const TemplateTypeParmType *TTP = T->getAs<TemplateTypeParmType>()) {<br>
- Out << 't' << TTP->getDepth() << '.' << TTP->getIndex();<br>
- return;<br>
- }<br>
- if (const TemplateSpecializationType *Spec<br>
- = T->getAs<TemplateSpecializationType>()) {<br>
- Out << '>';<br>
- VisitTemplateName(Spec->getTemplateName());<br>
- Out << Spec->getNumArgs();<br>
- for (unsigned I = 0, N = Spec->getNumArgs(); I != N; ++I)<br>
- VisitTemplateArgument(Spec->getArg(I));<br>
- return;<br>
- }<br>
-<br>
- // Unhandled type.<br>
- Out << ' ';<br>
- break;<br>
- } while (true);<br>
-}<br>
-<br>
-void USRGenerator::VisitTemplateParameterList(<br>
- const TemplateParameterList *Params) {<br>
- if (!Params)<br>
- return;<br>
- Out << '>' << Params->size();<br>
- for (TemplateParameterList::const_iterator P = Params->begin(),<br>
- PEnd = Params->end();<br>
- P != PEnd; ++P) {<br>
- Out << '#';<br>
- if (isa<TemplateTypeParmDecl>(*P)) {<br>
- if (cast<TemplateTypeParmDecl>(*P)->isParameterPack())<br>
- Out<< 'p';<br>
- Out << 'T';<br>
- continue;<br>
- }<br>
-<br>
- if (NonTypeTemplateParmDecl *NTTP = dyn_cast<NonTypeTemplateParmDecl>(*P)) {<br>
- if (NTTP->isParameterPack())<br>
- Out << 'p';<br>
- Out << 'N';<br>
- VisitType(NTTP->getType());<br>
- continue;<br>
- }<br>
-<br>
- TemplateTemplateParmDecl *TTP = cast<TemplateTemplateParmDecl>(*P);<br>
- if (TTP->isParameterPack())<br>
- Out << 'p';<br>
- Out << 't';<br>
- VisitTemplateParameterList(TTP->getTemplateParameters());<br>
- }<br>
-}<br>
-<br>
-void USRGenerator::VisitTemplateName(TemplateName Name) {<br>
- if (TemplateDecl *Template = Name.getAsTemplateDecl()) {<br>
- if (TemplateTemplateParmDecl *TTP<br>
- = dyn_cast<TemplateTemplateParmDecl>(Template)) {<br>
- Out << 't' << TTP->getDepth() << '.' << TTP->getIndex();<br>
- return;<br>
- }<br>
-<br>
- Visit(Template);<br>
- return;<br>
- }<br>
-<br>
- // FIXME: Visit dependent template names.<br>
-}<br>
-<br>
-void USRGenerator::VisitTemplateArgument(const TemplateArgument &Arg) {<br>
- switch (Arg.getKind()) {<br>
- case TemplateArgument::Null:<br>
- break;<br>
-<br>
- case TemplateArgument::Declaration:<br>
- Visit(Arg.getAsDecl());<br>
- break;<br>
-<br>
- case TemplateArgument::NullPtr:<br>
- break;<br>
-<br>
- case TemplateArgument::TemplateExpansion:<br>
- Out << 'P'; // pack expansion of...<br>
- // Fall through<br>
- case TemplateArgument::Template:<br>
- VisitTemplateName(Arg.getAsTemplateOrTemplatePattern());<br>
- break;<br>
-<br>
- case TemplateArgument::Expression:<br>
- // FIXME: Visit expressions.<br>
- break;<br>
-<br>
- case TemplateArgument::Pack:<br>
- Out << 'p' << Arg.pack_size();<br>
- for (TemplateArgument::pack_iterator P = Arg.pack_begin(), PEnd = Arg.pack_end();<br>
- P != PEnd; ++P)<br>
- VisitTemplateArgument(*P);<br>
- break;<br>
-<br>
- case TemplateArgument::Type:<br>
- VisitType(Arg.getAsType());<br>
- break;<br>
-<br>
- case TemplateArgument::Integral:<br>
- Out << 'V';<br>
- VisitType(Arg.getIntegralType());<br>
- Out << Arg.getAsIntegral();<br>
- break;<br>
- }<br>
-}<br>
-<br>
-//===----------------------------------------------------------------------===//<br>
-// USR generation functions.<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-void ide::generateUSRForObjCClass(StringRef Cls, raw_ostream &OS) {<br>
- OS << "objc(cs)" << Cls;<br>
-}<br>
-<br>
-void ide::generateUSRForObjCCategory(StringRef Cls, StringRef Cat,<br>
- raw_ostream &OS) {<br>
- OS << "objc(cy)" << Cls << '@' << Cat;<br>
-}<br>
-<br>
-void ide::generateUSRForObjCIvar(StringRef Ivar, raw_ostream &OS) {<br>
- OS << '@' << Ivar;<br>
-}<br>
-<br>
-void ide::generateUSRForObjCMethod(StringRef Sel, bool IsInstanceMethod,<br>
- raw_ostream &OS) {<br>
- OS << (IsInstanceMethod ? "(im)" : "(cm)") << Sel;<br>
-}<br>
-<br>
-void ide::generateUSRForObjCProperty(StringRef Prop, raw_ostream &OS) {<br>
- OS << "(py)" << Prop;<br>
-}<br>
-<br>
-void ide::generateUSRForObjCProtocol(StringRef Prot, raw_ostream &OS) {<br>
- OS << "objc(pl)" << Prot;<br>
-}<br>
-<br>
-bool ide::generateUSRForDecl(const Decl *D, SmallVectorImpl<char> &Buf) {<br>
- // Don't generate USRs for things with invalid locations.<br>
- if (!D || D->getLocStart().isInvalid())<br>
- return true;<br>
-<br>
- USRGenerator UG(&D->getASTContext(), Buf);<br>
- UG.Visit(D);<br>
- return UG.ignoreResults();<br>
-}<br>
<br>
Added: cfe/trunk/lib/Index/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/CMakeLists.txt?rev=188601&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/CMakeLists.txt?rev=188601&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Index/CMakeLists.txt (added)<br>
+++ cfe/trunk/lib/Index/CMakeLists.txt Fri Aug 16 19:40:41 2013<br>
@@ -0,0 +1,8 @@<br>
+add_clang_library(clangIndex<br>
+ USRGeneration.cpp<br>
+ )<br>
+<br>
+target_link_libraries(clangIndex<br>
+ clangBasic<br>
+ clangAST<br>
+ )<br>
<br>
Copied: cfe/trunk/lib/Index/Makefile (from r188600, cfe/trunk/lib/IDE/Makefile)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/Makefile?p2=cfe/trunk/lib/Index/Makefile&p1=cfe/trunk/lib/IDE/Makefile&r1=188600&r2=188601&rev=188601&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/Makefile?p2=cfe/trunk/lib/Index/Makefile&p1=cfe/trunk/lib/IDE/Makefile&r1=188600&r2=188601&rev=188601&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/IDE/Makefile (original)<br>
+++ cfe/trunk/lib/Index/Makefile Fri Aug 16 19:40:41 2013<br>
@@ -1,4 +1,4 @@<br>
-##===- clang/lib/IDE/Makefile ------------------------------*- Makefile -*-===##<br>
+##===- clang/lib/Index/Makefile ----------------------------*- Makefile -*-===##<br>
#<br>
# The LLVM Compiler Infrastructure<br>
#<br>
@@ -8,6 +8,6 @@<br>
##===----------------------------------------------------------------------===##<br>
<br>
CLANG_LEVEL := ../..<br>
-LIBRARYNAME := clangIDE<br>
+LIBRARYNAME := clangIndex<br>
<br>
include $(CLANG_LEVEL)/Makefile<br>
<br>
Copied: cfe/trunk/lib/Index/USRGeneration.cpp (from r188600, cfe/trunk/lib/IDE/USRGeneration.cpp)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/USRGeneration.cpp?p2=cfe/trunk/lib/Index/USRGeneration.cpp&p1=cfe/trunk/lib/IDE/USRGeneration.cpp&r1=188600&r2=188601&rev=188601&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/USRGeneration.cpp?p2=cfe/trunk/lib/Index/USRGeneration.cpp&p1=cfe/trunk/lib/IDE/USRGeneration.cpp&r1=188600&r2=188601&rev=188601&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/IDE/USRGeneration.cpp (original)<br>
+++ cfe/trunk/lib/Index/USRGeneration.cpp Fri Aug 16 19:40:41 2013<br>
@@ -7,7 +7,7 @@<br>
//<br>
//===----------------------------------------------------------------------===//<br>
<br>
-#include "clang/IDE/USRGeneration.h"<br>
+#include "clang/Index/USRGeneration.h"<br>
#include "clang/AST/ASTContext.h"<br>
#include "clang/AST/DeclTemplate.h"<br>
#include "clang/AST/DeclVisitor.h"<br>
@@ -40,7 +40,7 @@ public:<br>
generatedLoc(false)<br>
{<br>
// Add the USR space prefix.<br>
- Out << ide::getUSRSpacePrefix();<br>
+ Out << index::getUSRSpacePrefix();<br>
}<br>
<br>
bool ignoreResults() const { return IgnoreResults; }<br>
@@ -92,29 +92,29 @@ public:<br>
<br>
/// Generate a USR for an Objective-C class.<br>
void GenObjCClass(StringRef cls) {<br>
- ide::generateUSRForObjCClass(cls, Out);<br>
+ index::generateUSRForObjCClass(cls, Out);<br>
}<br>
/// Generate a USR for an Objective-C class category.<br>
void GenObjCCategory(StringRef cls, StringRef cat) {<br>
- ide::generateUSRForObjCCategory(cls, cat, Out);<br>
+ index::generateUSRForObjCCategory(cls, cat, Out);<br>
}<br>
/// Generate a USR fragment for an Objective-C instance variable. The<br>
/// complete USR can be created by concatenating the USR for the<br>
/// encompassing class with this USR fragment.<br>
void GenObjCIvar(StringRef ivar) {<br>
- ide::generateUSRForObjCIvar(ivar, Out);<br>
+ index::generateUSRForObjCIvar(ivar, Out);<br>
}<br>
/// Generate a USR fragment for an Objective-C method.<br>
void GenObjCMethod(StringRef sel, bool isInstanceMethod) {<br>
- ide::generateUSRForObjCMethod(sel, isInstanceMethod, Out);<br>
+ index::generateUSRForObjCMethod(sel, isInstanceMethod, Out);<br>
}<br>
/// Generate a USR fragment for an Objective-C property.<br>
void GenObjCProperty(StringRef prop) {<br>
- ide::generateUSRForObjCProperty(prop, Out);<br>
+ index::generateUSRForObjCProperty(prop, Out);<br>
}<br>
/// Generate a USR for an Objective-C protocol.<br>
void GenObjCProtocol(StringRef prot) {<br>
- ide::generateUSRForObjCProtocol(prot, Out);<br>
+ index::generateUSRForObjCProtocol(prot, Out);<br>
}<br>
<br>
void VisitType(QualType T);<br>
@@ -763,33 +763,33 @@ void USRGenerator::VisitTemplateArgument<br>
// USR generation functions.<br>
//===----------------------------------------------------------------------===//<br>
<br>
-void ide::generateUSRForObjCClass(StringRef Cls, raw_ostream &OS) {<br>
+void index::generateUSRForObjCClass(StringRef Cls, raw_ostream &OS) {<br>
OS << "objc(cs)" << Cls;<br>
}<br>
<br>
-void ide::generateUSRForObjCCategory(StringRef Cls, StringRef Cat,<br>
+void index::generateUSRForObjCCategory(StringRef Cls, StringRef Cat,<br>
raw_ostream &OS) {<br>
OS << "objc(cy)" << Cls << '@' << Cat;<br>
}<br>
<br>
-void ide::generateUSRForObjCIvar(StringRef Ivar, raw_ostream &OS) {<br>
+void index::generateUSRForObjCIvar(StringRef Ivar, raw_ostream &OS) {<br>
OS << '@' << Ivar;<br>
}<br>
<br>
-void ide::generateUSRForObjCMethod(StringRef Sel, bool IsInstanceMethod,<br>
+void index::generateUSRForObjCMethod(StringRef Sel, bool IsInstanceMethod,<br>
raw_ostream &OS) {<br>
OS << (IsInstanceMethod ? "(im)" : "(cm)") << Sel;<br>
}<br>
<br>
-void ide::generateUSRForObjCProperty(StringRef Prop, raw_ostream &OS) {<br>
+void index::generateUSRForObjCProperty(StringRef Prop, raw_ostream &OS) {<br>
OS << "(py)" << Prop;<br>
}<br>
<br>
-void ide::generateUSRForObjCProtocol(StringRef Prot, raw_ostream &OS) {<br>
+void index::generateUSRForObjCProtocol(StringRef Prot, raw_ostream &OS) {<br>
OS << "objc(pl)" << Prot;<br>
}<br>
<br>
-bool ide::generateUSRForDecl(const Decl *D, SmallVectorImpl<char> &Buf) {<br>
+bool index::generateUSRForDecl(const Decl *D, SmallVectorImpl<char> &Buf) {<br>
// Don't generate USRs for things with invalid locations.<br>
if (!D || D->getLocStart().isInvalid())<br>
return true;<br>
<br>
Modified: cfe/trunk/lib/Makefile<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Makefile?rev=188601&r1=188600&r2=188601&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Makefile?rev=188601&r1=188600&r2=188601&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Makefile (original)<br>
+++ cfe/trunk/lib/Makefile Fri Aug 16 19:40:41 2013<br>
@@ -11,7 +11,7 @@ CLANG_LEVEL := ..<br>
# ARCMigrate and Rewrite are always needed because of libclang.<br>
PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis Frontend \<br>
FrontendTool Tooling Driver Format Edit ARCMigrate Rewrite \<br>
- Serialization IDE<br>
+ Serialization Index<br>
<br>
include $(CLANG_LEVEL)/../../Makefile.config<br>
<br>
<br>
Modified: cfe/trunk/tools/libclang/CIndexUSRs.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndexUSRs.cpp?rev=188601&r1=188600&r2=188601&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndexUSRs.cpp?rev=188601&r1=188600&r2=188601&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/libclang/CIndexUSRs.cpp (original)<br>
+++ cfe/trunk/tools/libclang/CIndexUSRs.cpp Fri Aug 16 19:40:41 2013<br>
@@ -14,7 +14,7 @@<br>
#include "CIndexer.h"<br>
#include "CXCursor.h"<br>
#include "CXString.h"<br>
-#include "clang/IDE/USRGeneration.h"<br>
+#include "clang/Index/USRGeneration.h"<br>
#include "clang/Lex/PreprocessingRecord.h"<br>
#include "llvm/ADT/SmallString.h"<br>
#include "llvm/Support/raw_ostream.h"<br>
@@ -30,7 +30,7 @@ static inline StringRef extractUSRSuffix<br>
}<br>
<br>
bool cxcursor::getDeclCursorUSR(const Decl *D, SmallVectorImpl<char> &Buf) {<br>
- return ide::generateUSRForDecl(D, Buf);<br>
+ return index::generateUSRForDecl(D, Buf);<br>
}<br>
<br>
extern "C" {<br>
@@ -72,7 +72,7 @@ CXString clang_getCursorUSR(CXCursor C)<br>
if (!buf)<br>
return cxstring::createEmpty();<br>
<br>
- buf->Data += ide::getUSRSpacePrefix();<br>
+ buf->Data += index::getUSRSpacePrefix();<br>
buf->Data += "macro@";<br>
buf->Data +=<br>
cxcursor::getCursorMacroDefinition(C)->getName()->getNameStart();<br>
@@ -84,51 +84,51 @@ CXString clang_getCursorUSR(CXCursor C)<br>
}<br>
<br>
CXString clang_constructUSR_ObjCIvar(const char *name, CXString classUSR) {<br>
- SmallString<128> Buf(ide::getUSRSpacePrefix());<br>
+ SmallString<128> Buf(index::getUSRSpacePrefix());<br>
llvm::raw_svector_ostream OS(Buf);<br>
OS << extractUSRSuffix(clang_getCString(classUSR));<br>
- ide::generateUSRForObjCIvar(name, OS);<br>
+ index::generateUSRForObjCIvar(name, OS);<br>
return cxstring::createDup(OS.str());<br>
}<br>
<br>
CXString clang_constructUSR_ObjCMethod(const char *name,<br>
unsigned isInstanceMethod,<br>
CXString classUSR) {<br>
- SmallString<128> Buf(ide::getUSRSpacePrefix());<br>
+ SmallString<128> Buf(index::getUSRSpacePrefix());<br>
llvm::raw_svector_ostream OS(Buf);<br>
OS << extractUSRSuffix(clang_getCString(classUSR));<br>
- ide::generateUSRForObjCMethod(name, isInstanceMethod, OS);<br>
+ index::generateUSRForObjCMethod(name, isInstanceMethod, OS);<br>
return cxstring::createDup(OS.str());<br>
}<br>
<br>
CXString clang_constructUSR_ObjCClass(const char *name) {<br>
- SmallString<128> Buf(ide::getUSRSpacePrefix());<br>
+ SmallString<128> Buf(index::getUSRSpacePrefix());<br>
llvm::raw_svector_ostream OS(Buf);<br>
- ide::generateUSRForObjCClass(name, OS);<br>
+ index::generateUSRForObjCClass(name, OS);<br>
return cxstring::createDup(OS.str());<br>
}<br>
<br>
CXString clang_constructUSR_ObjCProtocol(const char *name) {<br>
- SmallString<128> Buf(ide::getUSRSpacePrefix());<br>
+ SmallString<128> Buf(index::getUSRSpacePrefix());<br>
llvm::raw_svector_ostream OS(Buf);<br>
- ide::generateUSRForObjCProtocol(name, OS);<br>
+ index::generateUSRForObjCProtocol(name, OS);<br>
return cxstring::createDup(OS.str());<br>
}<br>
<br>
CXString clang_constructUSR_ObjCCategory(const char *class_name,<br>
const char *category_name) {<br>
- SmallString<128> Buf(ide::getUSRSpacePrefix());<br>
+ SmallString<128> Buf(index::getUSRSpacePrefix());<br>
llvm::raw_svector_ostream OS(Buf);<br>
- ide::generateUSRForObjCCategory(class_name, category_name, OS);<br>
+ index::generateUSRForObjCCategory(class_name, category_name, OS);<br>
return cxstring::createDup(OS.str());<br>
}<br>
<br>
CXString clang_constructUSR_ObjCProperty(const char *property,<br>
CXString classUSR) {<br>
- SmallString<128> Buf(ide::getUSRSpacePrefix());<br>
+ SmallString<128> Buf(index::getUSRSpacePrefix());<br>
llvm::raw_svector_ostream OS(Buf);<br>
OS << extractUSRSuffix(clang_getCString(classUSR));<br>
- ide::generateUSRForObjCProperty(property, OS);<br>
+ index::generateUSRForObjCProperty(property, OS);<br>
return cxstring::createDup(OS.str());<br>
}<br>
<br>
<br>
Modified: cfe/trunk/tools/libclang/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CMakeLists.txt?rev=188601&r1=188600&r2=188601&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CMakeLists.txt?rev=188601&r1=188600&r2=188601&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/libclang/CMakeLists.txt (original)<br>
+++ cfe/trunk/tools/libclang/CMakeLists.txt Fri Aug 16 19:40:41 2013<br>
@@ -44,7 +44,7 @@ set(SOURCES<br>
)<br>
<br>
set(LIBRARIES<br>
- clangIDE<br>
+ clangIndex<br>
clangARCMigrate<br>
clangRewriteCore<br>
clangRewriteFrontend<br>
<br>
Modified: cfe/trunk/tools/libclang/Makefile<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/Makefile?rev=188601&r1=188600&r2=188601&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/Makefile?rev=188601&r1=188600&r2=188601&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/libclang/Makefile (original)<br>
+++ cfe/trunk/tools/libclang/Makefile Fri Aug 16 19:40:41 2013<br>
@@ -17,7 +17,7 @@ SHARED_LIBRARY = 1<br>
<br>
include $(CLANG_LEVEL)/../../Makefile.config<br>
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option<br>
-USEDLIBS = clangIDE.a clangFrontend.a clangDriver.a \<br>
+USEDLIBS = clangIndex.a clangFrontend.a clangDriver.a \<br>
clangTooling.a \<br>
clangSerialization.a \<br>
clangParse.a clangSema.a \<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>
</blockquote></div></div></div><br></div></blockquote></div><br></div>
</blockquote></div><br></div></body></html>