maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Resolve a layering violation by making AddTaggedVal public for 

PartialDiagnostic objects, and hoisting the stream operator for QualType into
Type.h with the operator for the normal DiagnosticBuilder. Also remove the no
longer needed friend declaration for the DeclarationName stream operator.

llvm-svn: 100169
This commit is contained in:
Chandler Carruth 2010-04-02 01:39:03 +00:00
parent 4244d12769
commit 4a70ae54b4
3 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/include/clang/AST/Type.h
View File

@ -17,6 +17,7 @@
#include "clang/Basic/Diagnostic.h" #include "clang/Basic/Diagnostic.h"
#include "clang/Basic/IdentifierTable.h" #include "clang/Basic/IdentifierTable.h"
#include "clang/Basic/Linkage.h" #include "clang/Basic/Linkage.h"
#include "clang/Basic/PartialDiagnostic.h"
#include "clang/AST/NestedNameSpecifier.h" #include "clang/AST/NestedNameSpecifier.h"
#include "clang/AST/TemplateName.h" #include "clang/AST/TemplateName.h"
#include "llvm/Support/Casting.h" #include "llvm/Support/Casting.h"
@ -3229,6 +3230,15 @@ inline const DiagnosticBuilder &operator<<(const DiagnosticBuilder &DB,
return DB; return DB;
} }
/// Insertion operator for partial diagnostics. This allows sending QualType's
/// into a diagnostic with <<.
inline const PartialDiagnostic &operator<<(const PartialDiagnostic &PD,
QualType T) {
PD.AddTaggedVal(reinterpret_cast<intptr_t>(T.getAsOpaquePtr()),
Diagnostic::ak_qualtype);
return PD;
}
// Helper class template that is used by Type::getAs to ensure that one does // Helper class template that is used by Type::getAs to ensure that one does
// not try to look through a qualified type to get to an array type. // not try to look through a qualified type to get to an array type.
template<typename T, template<typename T,

33
clang/include/clang/Basic/PartialDiagnostic.h
View File

@ -15,7 +15,6 @@
#ifndef LLVM_CLANG_PARTIALDIAGNOSTIC_H #ifndef LLVM_CLANG_PARTIALDIAGNOSTIC_H
#define LLVM_CLANG_PARTIALDIAGNOSTIC_H #define LLVM_CLANG_PARTIALDIAGNOSTIC_H
#include "clang/AST/Type.h"
#include "clang/Basic/Diagnostic.h" #include "clang/Basic/Diagnostic.h"
#include "clang/Basic/SourceLocation.h" #include "clang/Basic/SourceLocation.h"
#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/STLExtras.h"
@ -24,8 +23,6 @@
namespace clang { namespace clang {
class DeclarationName;
class PartialDiagnostic { class PartialDiagnostic {
public: public:
struct Storage { struct Storage {
@ -145,16 +142,6 @@ private:
DiagStorage = 0; DiagStorage = 0;
} }
void AddTaggedVal(intptr_t V, Diagnostic::ArgumentKind Kind) const {
if (!DiagStorage)
DiagStorage = getStorage();
assert(DiagStorage->NumDiagArgs < Storage::MaxArguments &&
"Too many arguments to diagnostic!");
DiagStorage->DiagArgumentsKind[DiagStorage->NumDiagArgs] = Kind;
DiagStorage->DiagArgumentsVal[DiagStorage->NumDiagArgs++] = V;
}
void AddSourceRange(const SourceRange &R) const { void AddSourceRange(const SourceRange &R) const {
if (!DiagStorage) if (!DiagStorage)
DiagStorage = getStorage(); DiagStorage = getStorage();
@ -219,6 +206,16 @@ public:
unsigned getDiagID() const { return DiagID; } unsigned getDiagID() const { return DiagID; }
void AddTaggedVal(intptr_t V, Diagnostic::ArgumentKind Kind) const {
if (!DiagStorage)
DiagStorage = getStorage();
assert(DiagStorage->NumDiagArgs < Storage::MaxArguments &&
"Too many arguments to diagnostic!");
DiagStorage->DiagArgumentsKind[DiagStorage->NumDiagArgs] = Kind;
DiagStorage->DiagArgumentsVal[DiagStorage->NumDiagArgs++] = V;
}
void Emit(const DiagnosticBuilder &DB) const { void Emit(const DiagnosticBuilder &DB) const {
if (!DiagStorage) if (!DiagStorage)
return; return;
@ -247,13 +244,6 @@ public:
bool hasStorage() const { return DiagStorage != 0; } bool hasStorage() const { return DiagStorage != 0; }
friend const PartialDiagnostic &operator<<(const PartialDiagnostic &PD,
QualType T) {
PD.AddTaggedVal(reinterpret_cast<intptr_t>(T.getAsOpaquePtr()),
Diagnostic::ak_qualtype);
return PD;
}
friend const PartialDiagnostic &operator<<(const PartialDiagnostic &PD, friend const PartialDiagnostic &operator<<(const PartialDiagnostic &PD,
unsigned I) { unsigned I) {
PD.AddTaggedVal(I, Diagnostic::ak_uint); PD.AddTaggedVal(I, Diagnostic::ak_uint);
@ -278,9 +268,6 @@ public:
return PD; return PD;
} }
friend const PartialDiagnostic &operator<<(const PartialDiagnostic &PD,
DeclarationName N);
friend const PartialDiagnostic &operator<<(const PartialDiagnostic &PD, friend const PartialDiagnostic &operator<<(const PartialDiagnostic &PD,
const FixItHint &Hint) { const FixItHint &Hint) {
PD.AddFixItHint(Hint); PD.AddFixItHint(Hint);