[cfe-commits] r173588 - libclang: some type safety for CXTranslationUnitImpl's internals
Dmitri Gribenko
gribozavr at gmail.com
Sat Jan 26 13:32:42 PST 2013
Author: gribozavr
Date: Sat Jan 26 15:32:42 2013
New Revision: 173588
URL: http://llvm.org/viewvc/llvm-project?rev=173588&view=rev
Log:
libclang: some type safety for CXTranslationUnitImpl's internals
There is no reason to store pointers as 'void*' in CXTranslationUnitImpl, since
it does not affect libclang ABI.
Modified:
cfe/trunk/tools/libclang/CIndex.cpp
cfe/trunk/tools/libclang/CIndexDiagnostic.cpp
cfe/trunk/tools/libclang/CXTranslationUnit.h
Modified: cfe/trunk/tools/libclang/CIndex.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=173588&r1=173587&r2=173588&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/CIndex.cpp (original)
+++ cfe/trunk/tools/libclang/CIndex.cpp Sat Jan 26 15:32:42 2013
@@ -60,12 +60,12 @@ using namespace clang::cxstring;
using namespace clang::cxtu;
using namespace clang::cxindex;
-CXTranslationUnit cxtu::MakeCXTranslationUnit(CIndexer *CIdx, ASTUnit *TU) {
- if (!TU)
+CXTranslationUnit cxtu::MakeCXTranslationUnit(CIndexer *CIdx, ASTUnit *AU) {
+ if (!AU)
return 0;
CXTranslationUnit D = new CXTranslationUnitImpl();
D->CIdx = CIdx;
- D->TUData = TU;
+ D->TheASTUnit = AU;
D->StringPool = createCXStringPool();
D->Diagnostics = 0;
D->OverridenCursorsPool = createOverridenCXCursorsPool();
Modified: cfe/trunk/tools/libclang/CIndexDiagnostic.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndexDiagnostic.cpp?rev=173588&r1=173587&r2=173588&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/CIndexDiagnostic.cpp (original)
+++ cfe/trunk/tools/libclang/CIndexDiagnostic.cpp Sat Jan 26 15:32:42 2013
@@ -209,7 +209,7 @@ CXDiagnosticSetImpl *cxdiag::lazyCreateD
extern "C" {
unsigned clang_getNumDiagnostics(CXTranslationUnit Unit) {
- if (!Unit->TUData)
+ if (!cxtu::getASTUnit(Unit))
return 0;
return lazyCreateDiags(Unit, /*checkIfChanged=*/true)->getNumDiagnostics();
}
@@ -227,7 +227,7 @@ CXDiagnostic clang_getDiagnostic(CXTrans
}
CXDiagnosticSet clang_getDiagnosticSetFromTU(CXTranslationUnit Unit) {
- if (!Unit->TUData)
+ if (!cxtu::getASTUnit(Unit))
return 0;
return static_cast<CXDiagnostic>(lazyCreateDiags(Unit));
}
Modified: cfe/trunk/tools/libclang/CXTranslationUnit.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CXTranslationUnit.h?rev=173588&r1=173587&r2=173588&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/CXTranslationUnit.h (original)
+++ cfe/trunk/tools/libclang/CXTranslationUnit.h Sat Jan 26 15:32:42 2013
@@ -16,17 +16,20 @@
#include "clang-c/Index.h"
-extern "C" {
+namespace clang {
+ class ASTUnit;
+ class CIndexer;
+} // namespace clang
+
struct CXTranslationUnitImpl {
void *CIdx;
- void *TUData;
+ clang::ASTUnit *TheASTUnit;
void *StringPool;
void *Diagnostics;
void *OverridenCursorsPool;
void *FormatContext;
unsigned FormatInMemoryUniqueId;
};
-}
namespace clang {
class ASTUnit;
@@ -34,10 +37,10 @@ namespace clang {
namespace cxtu {
-CXTranslationUnitImpl *MakeCXTranslationUnit(CIndexer *CIdx, ASTUnit *TU);
+CXTranslationUnitImpl *MakeCXTranslationUnit(CIndexer *CIdx, ASTUnit *AU);
static inline ASTUnit *getASTUnit(CXTranslationUnit TU) {
- return static_cast<ASTUnit *>(TU->TUData);
+ return TU->TheASTUnit;
}
class CXTUOwner {
More information about the cfe-commits
mailing list