166032069e
Now that we can easily revert Transactions' IR (by unloading their module) we do not need to queue the Decls before emitting them. This enables EndOfTU actions to be emitted seeminglessly, without extra transactions, or explicit post-EndOfTU-emission: each Transaction will have its TU finalized exactly once. This in turn allows us to turn on Debug emission - which relies on being invoked exactly once per Module. Transformers must be invoked before emitting Decls. They are now invoked for each Decl; WrapperTransformers are invoked when seeing a wrapper decl. They do not see the "full transaction AST" anymore - luckily none of our transformers requires this and actually become simpler because of this change. This also fixes a bug where the relative sequencing of parsed and deserialized Decls was lost (parsed was emitted before deserialized). Remove unused IRTransactions; they should really be llvm::Pass-es. We don't have them anyway. Disable a few transformations if the Decl isFromASTFile. When reverting a Transaction, also revert its nested ones. In the ValueExtractionSynthesizer, pass the ValuePrinter option as int, instead of the transaction pointer - that might have changed (at least its options) by the time we invoke the wrapper. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # Explicit paths specified without -i or -o; assuming --only paths... # rebase in progress; onto b3d9f92 # You are currently splitting a commit while rebasing branch 'declcollector-emits-v2' on 'b3d9f92'. # # Changes to be committed: # modified: interpreter/cling/include/cling/Interpreter/RuntimeUniverse.h # modified: interpreter/cling/lib/Interpreter/AutoSynthesizer.cpp # modified: interpreter/cling/lib/Interpreter/AutoSynthesizer.h # modified: interpreter/cling/lib/Interpreter/CheckEmptyTransactionTransformer.cpp # modified: interpreter/cling/lib/Interpreter/CheckEmptyTransactionTransformer.h # modified: interpreter/cling/lib/Interpreter/DeclCollector.cpp # modified: interpreter/cling/lib/Interpreter/DeclCollector.h # modified: interpreter/cling/lib/Interpreter/DeclExtractor.cpp # modified: interpreter/cling/lib/Interpreter/DeclExtractor.h # modified: interpreter/cling/lib/Interpreter/DynamicLookup.cpp # modified: interpreter/cling/lib/Interpreter/DynamicLookup.h # modified: interpreter/cling/lib/Interpreter/IncrementalParser.cpp # modified: interpreter/cling/lib/Interpreter/IncrementalParser.h # modified: interpreter/cling/lib/Interpreter/NullDerefProtectionTransformer.cpp # modified: interpreter/cling/lib/Interpreter/NullDerefProtectionTransformer.h # modified: interpreter/cling/lib/Interpreter/TransactionTransformer.cpp # modified: interpreter/cling/lib/Interpreter/TransactionTransformer.h # modified: interpreter/cling/lib/Interpreter/TransactionUnloader.cpp # modified: interpreter/cling/lib/Interpreter/ValueExtractionSynthesizer.cpp # modified: interpreter/cling/lib/Interpreter/ValueExtractionSynthesizer.h # modified: interpreter/cling/lib/Interpreter/ValuePrinterSynthesizer.cpp # modified: interpreter/cling/lib/Interpreter/ValuePrinterSynthesizer.h # # Untracked files: # .idea/ # 0001-Fix-llvm-merge-issue.patch # 0002-Fix-warnings.patch # 0003-Keep-weak-symbols-around-subsequent-transactions-mig.patch # T.cxx # T.cxx~ # TMVA.root # a.out # boost.root # config/Makefile.depend~ # core/textinput/src/textinput/TerminalDisplayWin.cpp.orig # ct.root # data.root # interpreter/cling/76fc2055249da7b03148a7d4197a279e9943f012.patch # interpreter/cling/lib/Interpreter/CIFactory.cpp~ # interpreter/cling/lib/Interpreter/DeclCollector.h~ # interpreter/cling/lib/Interpreter/DynamicLibraryManager.cpp~ # modulemap-one-header-per-file.txt # osrm-routed # tiles.tar.bz2 # tmva_class_example.root # tutorials/v3.root # weights/ #
188 lines
6.7 KiB
C++
188 lines
6.7 KiB
C++
//------------------------------------------------------------------------------
|
|
// CLING - the C++ LLVM-based InterpreterG :)
|
|
// author: Vassil Vassilev <vasil.georgiev.vasilev@cern.ch>
|
|
//
|
|
// This file is dual-licensed: you can choose to license it under the University
|
|
// of Illinois Open Source License or the GNU Lesser General Public License. See
|
|
// LICENSE.TXT for details.
|
|
//------------------------------------------------------------------------------
|
|
|
|
#include "ValuePrinterSynthesizer.h"
|
|
|
|
#include "cling/Interpreter/Interpreter.h"
|
|
#include "cling/Utils/AST.h"
|
|
|
|
#include "clang/AST/ASTContext.h"
|
|
#include "clang/AST/DeclGroup.h"
|
|
#include "clang/AST/Decl.h"
|
|
#include "clang/AST/DeclCXX.h"
|
|
#include "clang/AST/ExprCXX.h"
|
|
#include "clang/Sema/Lookup.h"
|
|
#include "clang/Sema/Scope.h"
|
|
#include "clang/Sema/Sema.h"
|
|
|
|
#include "llvm/Support/raw_os_ostream.h"
|
|
|
|
#include <iostream>
|
|
|
|
using namespace clang;
|
|
|
|
namespace cling {
|
|
|
|
ValuePrinterSynthesizer::ValuePrinterSynthesizer(clang::Sema* S,
|
|
llvm::raw_ostream* Stream)
|
|
: WrapperTransformer(S), m_Context(&S->getASTContext()) {
|
|
if (Stream)
|
|
m_ValuePrinterStream.reset(Stream);
|
|
else
|
|
m_ValuePrinterStream.reset(new llvm::raw_os_ostream(std::cout));
|
|
}
|
|
|
|
|
|
// pin the vtable here.
|
|
ValuePrinterSynthesizer::~ValuePrinterSynthesizer()
|
|
{ }
|
|
|
|
ASTTransformer::Result ValuePrinterSynthesizer::Transform(clang::Decl* D) {
|
|
if (getCompilationOpts().ValuePrinting == CompilationOptions::VPDisabled)
|
|
return Result(D, true);
|
|
|
|
FunctionDecl* FD = cast<FunctionDecl>(D);
|
|
assert(utils::Analyze::IsWrapper(FD) && "Expected wrapper");
|
|
if (tryAttachVP(FD))
|
|
return Result(FD, true);
|
|
return Result(0, false);
|
|
}
|
|
|
|
bool ValuePrinterSynthesizer::tryAttachVP(FunctionDecl* FD) {
|
|
// We have to be able to mark the expression for printout. There are
|
|
// three scenarios:
|
|
// 0: Expression printing disabled - don't do anything just exit.
|
|
// 1: Expression printing enabled - print no matter what.
|
|
// 2: Expression printing auto - analyze - rely on the omitted ';' to
|
|
// not produce the suppress marker.
|
|
int indexOfLastExpr = -1;
|
|
Expr* To = utils::Analyze::GetOrCreateLastExpr(FD, &indexOfLastExpr,
|
|
/*omitDS*/false,
|
|
m_Sema);
|
|
if (To) {
|
|
// Update the CompoundStmt body, avoiding alloc/dealloc of all the el.
|
|
CompoundStmt* CS = cast<CompoundStmt>(FD->getBody());
|
|
assert(CS && "Missing body?");
|
|
|
|
switch (getCompilationOpts().ValuePrinting) {
|
|
case CompilationOptions::VPDisabled:
|
|
assert(0 && "Don't wait that long. Exit early!");
|
|
break;
|
|
case CompilationOptions::VPEnabled:
|
|
break;
|
|
case CompilationOptions::VPAuto: {
|
|
// FIXME: Propagate the flag to the nested transactions also, they
|
|
// must have the same CO as their parents.
|
|
getCompilationOpts().ValuePrinting = CompilationOptions::VPEnabled;
|
|
if ((int)CS->size() > indexOfLastExpr+1
|
|
&& (*(CS->body_begin() + indexOfLastExpr + 1))
|
|
&& isa<NullStmt>(*(CS->body_begin() + indexOfLastExpr + 1))) {
|
|
// If next is NullStmt disable VP is disabled - exit. Signal this in
|
|
// the CO of the transaction.
|
|
getCompilationOpts().ValuePrinting = CompilationOptions::VPDisabled;
|
|
}
|
|
if (getCompilationOpts().ValuePrinting
|
|
== CompilationOptions::VPDisabled)
|
|
return true;
|
|
}
|
|
break;
|
|
}
|
|
|
|
// We can't PushDeclContext, because we don't have scope.
|
|
Sema::ContextRAII pushedDC(*m_Sema, FD);
|
|
|
|
if (To) {
|
|
// Strip the parenthesis if any
|
|
if (ParenExpr* PE = dyn_cast<ParenExpr>(To))
|
|
To = PE->getSubExpr();
|
|
|
|
Expr* Result = 0;
|
|
// if (!m_Sema->getLangOpts().CPlusPlus)
|
|
// Result = SynthesizeVP(To);
|
|
|
|
if (Result)
|
|
*(CS->body_begin()+indexOfLastExpr) = Result;
|
|
}
|
|
// Clear the artificial NullStmt-s
|
|
if (!ClearNullStmts(CS)) {
|
|
// FIXME: Why it is here? Shouldn't it be in DeclExtractor?
|
|
// if no body remove the wrapper
|
|
DeclContext* DC = FD->getDeclContext();
|
|
Scope* S = m_Sema->getScopeForContext(DC);
|
|
if (S)
|
|
S->RemoveDecl(FD);
|
|
DC->removeDecl(FD);
|
|
}
|
|
}
|
|
else // if nothing to attach to set the CO's ValuePrinting to disabled.
|
|
getCompilationOpts().ValuePrinting = CompilationOptions::VPDisabled;
|
|
return true;
|
|
}
|
|
|
|
// We need to artificially create:
|
|
// cling_PrintValue(void* (ASTContext)C, void* (Expr)E, const void* (&i)
|
|
Expr* ValuePrinterSynthesizer::SynthesizeVP(Expr* E) {
|
|
QualType QT = E->getType();
|
|
// For now we skip void and function pointer types.
|
|
if (!QT.isNull() && (QT->isVoidType() || QT->isFunctionType()))
|
|
return 0;
|
|
|
|
// Find cling_PrintValue
|
|
SourceLocation NoSLoc = SourceLocation();
|
|
DeclarationName PVName = &m_Context->Idents.get("cling_PrintValue");
|
|
LookupResult R(*m_Sema, PVName, E->getLocStart(), Sema::LookupOrdinaryName,
|
|
Sema::ForRedeclaration);
|
|
|
|
Scope* S = m_Sema->getScopeForContext(m_Sema->CurContext);
|
|
m_Sema->LookupName(R, S);
|
|
assert(!R.empty() && "Cannot find cling_PrintValue(...)");
|
|
|
|
CXXScopeSpec CSS;
|
|
Expr* UnresolvedLookup
|
|
= m_Sema->BuildDeclarationNameExpr(CSS, R, /*ADL*/ false).get();
|
|
|
|
|
|
Expr* VoidEArg = utils::Synthesize::CStyleCastPtrExpr(m_Sema,
|
|
m_Context->VoidPtrTy,
|
|
(uint64_t)E);
|
|
Expr* VoidCArg = utils::Synthesize::CStyleCastPtrExpr(m_Sema,
|
|
m_Context->VoidPtrTy,
|
|
(uint64_t)m_Context);
|
|
|
|
if (!QT->isPointerType()) {
|
|
while(ImplicitCastExpr* ICE = dyn_cast<ImplicitCastExpr>(E))
|
|
E = ICE->getSubExpr();
|
|
E = m_Sema->BuildUnaryOp(S, NoSLoc, UO_AddrOf, E).get();
|
|
}
|
|
|
|
llvm::SmallVector<Expr*, 4> CallArgs;
|
|
CallArgs.push_back(VoidEArg);
|
|
CallArgs.push_back(VoidCArg);
|
|
CallArgs.push_back(E);
|
|
|
|
Expr* Result = m_Sema->ActOnCallExpr(S, UnresolvedLookup, E->getLocStart(),
|
|
CallArgs, E->getLocEnd()).get();
|
|
assert(Result && "Cannot create value printer!");
|
|
|
|
return Result;
|
|
}
|
|
|
|
|
|
unsigned ValuePrinterSynthesizer::ClearNullStmts(CompoundStmt* CS) {
|
|
llvm::SmallVector<Stmt*, 8> FBody;
|
|
for (StmtRange range = CS->children(); range; ++range)
|
|
if (!isa<NullStmt>(*range))
|
|
FBody.push_back(*range);
|
|
|
|
CS->setStmts(*m_Context, FBody.data(), FBody.size());
|
|
return FBody.size();
|
|
}
|
|
|
|
} // namespace cling
|