replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move ArrayRef to LLVM.h and eliminate now-redundant qualifiers, patch by Jon Mulder! 

llvm-svn: 135855
This commit is contained in:
Chris Lattner 2011-07-23 17:14:25 +00:00
parent 7e6ca972c9
commit 54b1677d23
19 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/include/clang/Basic/Diagnostic.h
View File

@ -987,8 +987,8 @@ public:
StringRef Message);
StoredDiagnostic(Diagnostic::Level Level, unsigned ID,
StringRef Message, FullSourceLoc Loc,
llvm::ArrayRef<CharSourceRange> Ranges,
llvm::ArrayRef<FixItHint> Fixits);
ArrayRef<CharSourceRange> Ranges,
ArrayRef<FixItHint> Fixits);
~StoredDiagnostic();
/// \brief Evaluates true when this object stores a diagnostic.

4
clang/include/clang/Basic/LLVM.h
View File

@ -23,11 +23,12 @@ namespace llvm {
// ADT's.
class StringRef;
class Twine;
template<typename T> class ArrayRef;
template<typename T, unsigned N> class SmallVector;
template<typename T> class SmallVectorImpl;
class raw_ostream;
// TODO: ArrayRef, DenseMap, ...
// TODO: DenseMap, ...
}
@ -42,6 +43,7 @@ namespace clang {
// ADT's.
using llvm::StringRef;
using llvm::Twine;
using llvm::ArrayRef;
using llvm::SmallVector;
using llvm::SmallVectorImpl;

4
clang/include/clang/Driver/Driver.h
View File

@ -223,14 +223,14 @@ public:
/// argument vector. A null return value does not necessarily
/// indicate an error condition, the diagnostics should be queried
/// to determine if an error occurred.
Compilation *BuildCompilation(llvm::ArrayRef<const char *> Args);
Compilation *BuildCompilation(ArrayRef<const char *> Args);
/// @name Driver Steps
/// @{
/// ParseArgStrings - Parse the given list of strings into an
/// ArgList.
InputArgList *ParseArgStrings(llvm::ArrayRef<const char *> Args);
InputArgList *ParseArgStrings(ArrayRef<const char *> Args);
/// BuildActions - Construct the list of actions to perform for the
/// given arguments, which are only done for a single architecture.

2
clang/include/clang/Frontend/Utils.h
View File

@ -100,7 +100,7 @@ void CacheTokens(Preprocessor &PP, llvm::raw_fd_ostream* OS);
/// \return A CompilerInvocation, or 0 if none was built for the given
/// argument vector.
CompilerInvocation *
createInvocationFromCommandLine(llvm::ArrayRef<const char *> Args,
createInvocationFromCommandLine(ArrayRef<const char *> Args,
llvm::IntrusiveRefCntPtr<Diagnostic> Diags =
llvm::IntrusiveRefCntPtr<Diagnostic>());

2
clang/include/clang/Lex/Preprocessor.h
View File

@ -1006,7 +1006,7 @@ private:
/// going to lex in the cache and when it finishes the tokens are removed
/// from the end of the cache.
Token *cacheMacroExpandedTokens(TokenLexer *tokLexer,
llvm::ArrayRef<Token> tokens);
ArrayRef<Token> tokens);
void removeCachedMacroExpandedTokensOfLastLexer();
friend void TokenLexer::ExpandFunctionArguments();

4
clang/lib/ARCMigrate/ARCMT.cpp
View File

@ -22,7 +22,7 @@
using namespace clang;
using namespace arcmt;
bool CapturedDiagList::clearDiagnostic(llvm::ArrayRef<unsigned> IDs,
bool CapturedDiagList::clearDiagnostic(ArrayRef<unsigned> IDs,
SourceRange range) {
if (range.isInvalid())
return false;
@ -51,7 +51,7 @@ bool CapturedDiagList::clearDiagnostic(llvm::ArrayRef<unsigned> IDs,
return cleared;
}
bool CapturedDiagList::hasDiagnostic(llvm::ArrayRef<unsigned> IDs,
bool CapturedDiagList::hasDiagnostic(ArrayRef<unsigned> IDs,
SourceRange range) const {
if (range.isInvalid())
return false;

10
clang/lib/ARCMigrate/Internals.h
View File

@ -26,8 +26,8 @@ class CapturedDiagList {
public:
void push_back(const StoredDiagnostic &diag) { List.push_back(diag); }
bool clearDiagnostic(llvm::ArrayRef<unsigned> IDs, SourceRange range);
bool hasDiagnostic(llvm::ArrayRef<unsigned> IDs, SourceRange range) const;
bool clearDiagnostic(ArrayRef<unsigned> IDs, SourceRange range);
bool hasDiagnostic(ArrayRef<unsigned> IDs, SourceRange range) const;
void reportDiagnostics(Diagnostic &diags) const;
@ -39,7 +39,7 @@ public:
};
void writeARCDiagsToPlist(const std::string &outPath,
llvm::ArrayRef<StoredDiagnostic> diags,
ArrayRef<StoredDiagnostic> diags,
SourceManager &SM, const LangOptions &LangOpts);
class TransformActions {
@ -69,9 +69,9 @@ public:
void increaseIndentation(SourceRange range,
SourceLocation parentIndent);
bool clearDiagnostic(llvm::ArrayRef<unsigned> IDs, SourceRange range);
bool clearDiagnostic(ArrayRef<unsigned> IDs, SourceRange range);
bool clearAllDiagnostics(SourceRange range) {
return clearDiagnostic(llvm::ArrayRef<unsigned>(), range);
return clearDiagnostic(ArrayRef<unsigned>(), range);
}
bool clearDiagnostic(unsigned ID1, unsigned ID2, SourceRange range) {
unsigned IDs[] = { ID1, ID2 };

6
clang/lib/ARCMigrate/PlistReporter.cpp
View File

@ -92,7 +92,7 @@ static raw_ostream& EmitString(raw_ostream& o,
}
void arcmt::writeARCDiagsToPlist(const std::string &outPath,
llvm::ArrayRef<StoredDiagnostic> diags,
ArrayRef<StoredDiagnostic> diags,
SourceManager &SM,
const LangOptions &LangOpts) {
DiagnosticIDs DiagIDs;
@ -102,7 +102,7 @@ void arcmt::writeARCDiagsToPlist(const std::string &outPath,
FIDMap FM;
SmallVector<FileID, 10> Fids;
for (llvm::ArrayRef<StoredDiagnostic>::iterator
for (ArrayRef<StoredDiagnostic>::iterator
I = diags.begin(), E = diags.end(); I != E; ++I) {
const StoredDiagnostic &D = *I;
@ -145,7 +145,7 @@ void arcmt::writeARCDiagsToPlist(const std::string &outPath,
" <key>diagnostics</key>\n"
" <array>\n";
for (llvm::ArrayRef<StoredDiagnostic>::iterator
for (ArrayRef<StoredDiagnostic>::iterator
DI = diags.begin(), DE = diags.end(); DI != DE; ++DI) {
const StoredDiagnostic &D = *DI;

10
clang/lib/ARCMigrate/TransformActions.cpp
View File

@ -140,7 +140,7 @@ public:
void increaseIndentation(SourceRange range,
SourceLocation parentIndent);
bool clearDiagnostic(llvm::ArrayRef<unsigned> IDs, SourceRange range);
bool clearDiagnostic(ArrayRef<unsigned> IDs, SourceRange range);
void applyRewrites(TransformActions::RewriteReceiver &receiver);
@ -159,7 +159,7 @@ private:
void commitReplaceText(SourceLocation loc, StringRef text,
StringRef replacementText);
void commitIncreaseIndentation(SourceRange range,SourceLocation parentIndent);
void commitClearDiagnostic(llvm::ArrayRef<unsigned> IDs, SourceRange range);
void commitClearDiagnostic(ArrayRef<unsigned> IDs, SourceRange range);
void addRemoval(CharSourceRange range);
void addInsertion(SourceLocation loc, StringRef text);
@ -362,7 +362,7 @@ void TransformActionsImpl::increaseIndentation(SourceRange range,
CachedActions.push_back(data);
}
bool TransformActionsImpl::clearDiagnostic(llvm::ArrayRef<unsigned> IDs,
bool TransformActionsImpl::clearDiagnostic(ArrayRef<unsigned> IDs,
SourceRange range) {
assert(IsInTransaction && "Actions only allowed during a transaction");
if (!CapturedDiags.hasDiagnostic(IDs, range))
@ -494,7 +494,7 @@ void TransformActionsImpl::commitIncreaseIndentation(SourceRange range,
SM.getInstantiationLoc(parentIndent)));
}
void TransformActionsImpl::commitClearDiagnostic(llvm::ArrayRef<unsigned> IDs,
void TransformActionsImpl::commitClearDiagnostic(ArrayRef<unsigned> IDs,
SourceRange range) {
CapturedDiags.clearDiagnostic(IDs, range);
}
@ -661,7 +661,7 @@ void TransformActions::increaseIndentation(SourceRange range,
parentIndent);
}
bool TransformActions::clearDiagnostic(llvm::ArrayRef<unsigned> IDs,
bool TransformActions::clearDiagnostic(ArrayRef<unsigned> IDs,
SourceRange range) {
return static_cast<TransformActionsImpl*>(Impl)->clearDiagnostic(IDs, range);
}

4
clang/lib/Basic/Diagnostic.cpp
View File

@ -728,8 +728,8 @@ StoredDiagnostic::StoredDiagnostic(Diagnostic::Level Level,
StoredDiagnostic::StoredDiagnostic(Diagnostic::Level Level, unsigned ID,
StringRef Message, FullSourceLoc Loc,
llvm::ArrayRef<CharSourceRange> Ranges,
llvm::ArrayRef<FixItHint> Fixits)
ArrayRef<CharSourceRange> Ranges,
ArrayRef<FixItHint> Fixits)
: ID(ID), Level(Level), Loc(Loc), Message(Message)
{
this->Ranges.assign(Ranges.begin(), Ranges.end());

4
clang/lib/CodeGen/CGCall.cpp
View File

@ -1431,7 +1431,7 @@ void CodeGenFunction::EmitCallArg(CallArgList &args, const Expr *E,
/// on the current state of the EH stack.
llvm::CallSite
CodeGenFunction::EmitCallOrInvoke(llvm::Value *Callee,
llvm::ArrayRef<llvm::Value *> Args,
ArrayRef<llvm::Value *> Args,
const Twine &Name) {
llvm::BasicBlock *InvokeDest = getInvokeDest();
if (!InvokeDest)
@ -1447,7 +1447,7 @@ CodeGenFunction::EmitCallOrInvoke(llvm::Value *Callee,
llvm::CallSite
CodeGenFunction::EmitCallOrInvoke(llvm::Value *Callee,
const Twine &Name) {
return EmitCallOrInvoke(Callee, llvm::ArrayRef<llvm::Value *>(), Name);
return EmitCallOrInvoke(Callee, ArrayRef<llvm::Value *>(), Name);
}
static void checkArgMatches(llvm::Value *Elt, unsigned &ArgNo,

2
clang/lib/CodeGen/CodeGenFunction.h
View File

@ -2074,7 +2074,7 @@ public:
ReturnValueSlot ReturnValue = ReturnValueSlot());
llvm::CallSite EmitCallOrInvoke(llvm::Value *Callee,
llvm::ArrayRef<llvm::Value *> Args,
ArrayRef<llvm::Value *> Args,
const Twine &Name = "");
llvm::CallSite EmitCallOrInvoke(llvm::Value *Callee,
const Twine &Name = "");

2
clang/lib/CodeGen/CodeGenModule.cpp
View File

@ -1625,7 +1625,7 @@ llvm::Value *CodeGenModule::getBuiltinLibFunction(const FunctionDecl *FD,
}
llvm::Function *CodeGenModule::getIntrinsic(unsigned IID,
llvm::ArrayRef<llvm::Type*> Tys) {
ArrayRef<llvm::Type*> Tys) {
return llvm::Intrinsic::getDeclaration(&getModule(), (llvm::Intrinsic::ID)IID,
Tys);
}

4
clang/lib/CodeGen/CodeGenModule.h
View File

@ -573,8 +573,8 @@ public:
llvm::Value *getBuiltinLibFunction(const FunctionDecl *FD,
unsigned BuiltinID);
llvm::Function *getIntrinsic(unsigned IID, llvm::ArrayRef<llvm::Type*> Tys =
llvm::ArrayRef<llvm::Type*>());
llvm::Function *getIntrinsic(unsigned IID, ArrayRef<llvm::Type*> Tys =
ArrayRef<llvm::Type*>());
/// EmitTopLevelDecl - Emit code for a single top level declaration.
void EmitTopLevelDecl(Decl *D);

4
clang/lib/Driver/Driver.cpp
View File

@ -96,7 +96,7 @@ Driver::~Driver() {
delete Host;
}
InputArgList *Driver::ParseArgStrings(llvm::ArrayRef<const char *> ArgList) {
InputArgList *Driver::ParseArgStrings(ArrayRef<const char *> ArgList) {
llvm::PrettyStackTraceString CrashInfo("Command line argument parsing");
unsigned MissingArgIndex, MissingArgCount;
InputArgList *Args = getOpts().ParseArgs(ArgList.begin(), ArgList.end(),
@ -201,7 +201,7 @@ DerivedArgList *Driver::TranslateInputArgs(const InputArgList &Args) const {
return DAL;
}
Compilation *Driver::BuildCompilation(llvm::ArrayRef<const char *> ArgList) {
Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
llvm::PrettyStackTraceString CrashInfo("Compilation construction");
// FIXME: Handle environment options which effect driver behavior, somewhere

2
clang/lib/Frontend/CreateInvocationFromCommandLine.cpp
View File

@ -29,7 +29,7 @@ using namespace clang;
/// \return A CompilerInvocation, or 0 if none was built for the given
/// argument vector.
CompilerInvocation *
clang::createInvocationFromCommandLine(llvm::ArrayRef<const char *> ArgList,
clang::createInvocationFromCommandLine(ArrayRef<const char *> ArgList,
llvm::IntrusiveRefCntPtr<Diagnostic> Diags) {
if (!Diags.getPtr()) {
// No diagnostics engine was provided, so create our own diagnostics object

2
clang/lib/Lex/PPMacroExpansion.cpp
View File

@ -497,7 +497,7 @@ MacroArgs *Preprocessor::ReadFunctionLikeMacroArgs(Token &MacroName,
/// going to lex in the cache and when it finishes the tokens are removed
/// from the end of the cache.
Token *Preprocessor::cacheMacroExpandedTokens(TokenLexer *tokLexer,
llvm::ArrayRef<Token> tokens) {
ArrayRef<Token> tokens) {
assert(tokLexer);
if (tokens.empty())
return 0;

2
clang/lib/Sema/SemaStmt.cpp
View File

@ -1883,7 +1883,7 @@ static bool CheckAsmLValue(const Expr *E, Sema &S) {
/// isOperandMentioned - Return true if the specified operand # is mentioned
/// anywhere in the decomposed asm string.
static bool isOperandMentioned(unsigned OpNo,
llvm::ArrayRef<AsmStmt::AsmStringPiece> AsmStrPieces) {
ArrayRef<AsmStmt::AsmStringPiece> AsmStrPieces) {
for (unsigned p = 0, e = AsmStrPieces.size(); p != e; ++p) {
const AsmStmt::AsmStringPiece &Piece = AsmStrPieces[p];
if (!Piece.isOperand()) continue;

8
clang/tools/arcmt-test/arcmt-test.cpp
View File

@ -104,7 +104,7 @@ public:
} // anonymous namespace
static bool checkForMigration(StringRef resourcesPath,
llvm::ArrayRef<const char *> Args) {
ArrayRef<const char *> Args) {
DiagnosticClient *DiagClient =
new TextDiagnosticPrinter(llvm::errs(), DiagnosticOptions());
llvm::IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
@ -146,7 +146,7 @@ static void printResult(FileRemapper &remapper, raw_ostream &OS) {
}
static bool performTransformations(StringRef resourcesPath,
llvm::ArrayRef<const char *> Args) {
ArrayRef<const char *> Args) {
// Check first.
if (checkForMigration(resourcesPath, Args))
return true;
@ -215,7 +215,7 @@ static bool filesCompareEqual(StringRef fname1, StringRef fname2) {
return file1->getBuffer() == file2->getBuffer();
}
static bool verifyTransformedFiles(llvm::ArrayRef<std::string> resultFiles) {
static bool verifyTransformedFiles(ArrayRef<std::string> resultFiles) {
using namespace llvm;
assert(!resultFiles.empty());
@ -364,7 +364,7 @@ int main(int argc, const char **argv) {
return 1;
}
llvm::ArrayRef<const char*> Args(argv+optargc+1, argc-optargc-1);
ArrayRef<const char*> Args(argv+optargc+1, argc-optargc-1);
if (CheckOnly)
return checkForMigration(resourcesPath, Args);