gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

By Vassil: update to current llvm.

Browse Source
This commit is contained in:
Axel Naumann 2013-09-23 15:36:32 +02:00 committed by sftnight
parent 17ffb2bbb4
commit 68c8bb74e8
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Interpreter/DynamicLibraryManager.cpp
View File

@ -163,7 +163,7 @@ namespace cling {
if (!isDyLib)
return kLoadLibError;
assert(!FoundDyLib.isEmpty() && "The shared lib exists but can't find it!");
assert(!FoundDyLib.empty() && "The shared lib exists but can't find it!");
// TODO: !permanent case
#ifdef WIN32

2
lib/Interpreter/IncrementalParser.cpp
View File

@ -590,7 +590,7 @@ namespace cling {
// is due to a top-level semicolon, an action override, or a parse error
// skipping something.
if (ADecl)
m_Consumer->HandleTopLevelDecl(ADecl.getAsVal<DeclGroupRef>());
m_Consumer->HandleTopLevelDecl(ADecl.get());
};
// Process any TopLevelDecls generated by #pragma weak.

27
lib/Interpreter/Interpreter.cpp
View File

@ -484,15 +484,24 @@ namespace cling {
const DirectoryLookup* LookupFrom = 0;
const DirectoryLookup* CurDir = 0;
Module* module = 0;
PP.LookupFile(headerFile, isAngled, LookupFrom, CurDir, /*SearchPath*/0,
/*RelativePath*/ 0, &module, /*SkipCache*/false);
if (!module)
ModuleMap::KnownHeader suggestedModule;
// PP::LookupFile uses it to issue 'nice' diagnostic
SourceLocation fileNameLoc;
PP.LookupFile(fileNameLoc, headerFile, isAngled, LookupFrom, CurDir,
/*SearchPath*/0, /*RelativePath*/ 0, &suggestedModule,
/*SkipCache*/false);
if (!suggestedModule)
return Interpreter::kFailure;
SourceLocation fileNameLoc;
ModuleIdPath path = std::make_pair(PP.getIdentifierInfo(module->Name),
fileNameLoc);
// Copied from PPDirectives.cpp
SmallVector<std::pair<IdentifierInfo *, SourceLocation>, 2> path;
for (Module *mod = suggestedModule.getModule(); mod; mod = mod->Parent) {
IdentifierInfo* II
= &getSema().getPreprocessor().getIdentifierTable().get(mod->Name);
path.push_back(std::make_pair(II, fileNameLoc));
}
std::reverse(path.begin(), path.end());
// Pretend that the module came from an inclusion directive, so that clang
// will create an implicit import declaration to capture it in the AST.
@ -619,7 +628,7 @@ namespace cling {
Lexer WrapLexer(SourceLocation(), getSema().getLangOpts(), input.c_str(),
input.c_str(), input.c_str() + input.size());
Token Tok;
WrapLexer.Lex(Tok);
WrapLexer.LexFromRawLexer(Tok);
const tok::TokenKind kind = Tok.getKind();
@ -635,7 +644,7 @@ namespace cling {
return false;
}
else if (kind == tok::hash) {
WrapLexer.Lex(Tok);
WrapLexer.LexFromRawLexer(Tok);
if (Tok.is(tok::raw_identifier) && !Tok.needsCleaning()) {
StringRef keyword(Tok.getRawIdentifierData(), Tok.getLength());
if (keyword.equals("include"))