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

Implement unloading of transactions that are nested below uncommitted ones.

Browse Source
This commit is contained in:
Axel Naumann 2015-02-18 12:38:05 +01:00 committed by sftnight
parent c1cf9236c0
commit ff65075668
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Interpreter/IncrementalParser.cpp
View File

@ -639,7 +639,19 @@ namespace cling {
void IncrementalParser::rollbackTransaction(Transaction* T) {
assert(T && "Must have value");
assert(T == getLastTransaction() && "We always must revert the last T");
#ifndef NDEBUG
{
bool canRevertTransaction = T == getLastTransaction();
Transaction* ChkT = T;
while (!canRevertTransaction && ChkT->getParent())
canRevertTransaction |=
ChkT->getState() == Transaction::kCollecting
|| ChkT->getState() == Transaction::kCompleted;
assert(canRevertTransaction &&
"Can only revert most recent transaction or uncommitted nested "
"transaction");
}
#endif
assert((T->getState() != Transaction::kRolledBack ||
T->getState() != Transaction::kRolledBackWithErrors) &&
"Transaction already rolled back.");
@ -653,8 +665,12 @@ namespace cling {
else
T->setState(Transaction::kRolledBackWithErrors);
// Remove from the queue
m_Transactions.pop_back();
if (Transaction* Parent = T->getParent()) {
Parent->removeNestedTransaction(T);
} else {
// Remove from the queue
m_Transactions.pop_back();
}
//m_TransactionPool->releaseTransaction(T);
}