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

Split the generation of autoloading maps into parser and fwd declarer.

Browse Source
This commit is contained in:
Vassil Vassilev 2014-08-20 15:19:33 +02:00 committed by sftnight
parent 6f456b59d0
commit 2440257f5b
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/cling/Interpreter/Interpreter.h
View File

@ -629,6 +629,10 @@ namespace cling {
void GenerateAutoloadingMap(llvm::StringRef inFile, llvm::StringRef outFile,
bool enableMacros = false, bool enableLogs = true);
void forwardDeclare(Transaction& T, llvm::raw_ostream& out,
bool enableMacros = false,
llvm::raw_ostream* logs = 0);
friend class runtime::internal::LifetimeHandler;
// FIXME: workaround until JIT supports exceptions
static jmp_buf*& getNullDerefJump() { return m_JumpBuf; }

29
lib/Interpreter/Interpreter.cpp
View File

@ -1236,21 +1236,24 @@ namespace cling {
std::string err;
llvm::raw_fd_ostream out(outFile.data(), err,
llvm::sys::fs::OpenFlags::F_None);
if (enableLogs){
llvm::raw_fd_ostream log(llvm::Twine(outFile).concat(llvm::Twine(".skipped")).str().c_str(),
llvm::raw_fd_ostream log((outFile + ".skipped").str().c_str(),
err, llvm::sys::fs::OpenFlags::F_None);
log << "Generated for :" << inFile << "\n";
ForwardDeclPrinter visitor(out, log, fwdGen.getSema().getSourceManager(), *T);
visitor.printStats();
}
else {
llvm::raw_null_ostream sink;
ForwardDeclPrinter visitor(out, sink, fwdGen.getSema().getSourceManager(), *T);
}
log << "Generated for :" << inFile << "\n";
forwardDeclare(*T, out, enableMacros, &log);
}
void Interpreter::forwardDeclare(Transaction& T, llvm::raw_ostream& out,
bool enableMacros /*=false*/,
llvm::raw_ostream* logs /*=0*/) {
// Maybe logs should be defaulted to llvm::raw_null_ostream sink;
if (!logs)
logs = &llvm::errs();
ForwardDeclPrinter visitor(out, *logs, getSema().getSourceManager(), T);
visitor.printStats();
// Avoid assertion in the ~IncrementalParser.
T->setState(Transaction::kCommitted);
// unload(1);
return;
T.setState(Transaction::kCommitted);
}
} //end namespace cling