Compare commits
1
Commits
a792352387
...
c45d3cba81
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c45d3cba81 |
+5
-2
@@ -3904,11 +3904,12 @@ struct Result {
|
|||||||
Result() = default;
|
Result() = default;
|
||||||
Result(Node *insertionPoint, TrivialSpan remaining)
|
Result(Node *insertionPoint, TrivialSpan remaining)
|
||||||
: insertionPoint(insertionPoint), remaining(remaining),
|
: insertionPoint(insertionPoint), remaining(remaining),
|
||||||
endInsertionPoint(nullptr) {}
|
endInsertionPoint(nullptr), endRemaining{}, nextRangeWrite(nullptr) {}
|
||||||
Result(Node *insertionPoint, TrivialSpan remaining, Node *endInsertionPoint,
|
Result(Node *insertionPoint, TrivialSpan remaining, Node *endInsertionPoint,
|
||||||
TrivialSpan endRemaining)
|
TrivialSpan endRemaining)
|
||||||
: insertionPoint(insertionPoint), remaining(remaining),
|
: insertionPoint(insertionPoint), remaining(remaining),
|
||||||
endInsertionPoint(endInsertionPoint), endRemaining(endRemaining) {}
|
endInsertionPoint(endInsertionPoint), endRemaining(endRemaining),
|
||||||
|
nextRangeWrite(nullptr) {}
|
||||||
|
|
||||||
Node *insertionPoint;
|
Node *insertionPoint;
|
||||||
TrivialSpan remaining;
|
TrivialSpan remaining;
|
||||||
@@ -4979,10 +4980,12 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
|
|||||||
fprintf(stderr, "search path: %s, begin: %s\n",
|
fprintf(stderr, "search path: %s, begin: %s\n",
|
||||||
getSearchPathPrintable(b).c_str(),
|
getSearchPathPrintable(b).c_str(),
|
||||||
printable(context.results[i].remaining).c_str());
|
printable(context.results[i].remaining).c_str());
|
||||||
|
if (e != nullptr) {
|
||||||
fprintf(stderr, "search path: %s, end: %s\n",
|
fprintf(stderr, "search path: %s, end: %s\n",
|
||||||
getSearchPathPrintable(e).c_str(),
|
getSearchPathPrintable(e).c_str(),
|
||||||
printable(context.results[i].endRemaining).c_str());
|
printable(context.results[i].endRemaining).c_str());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
while (context.results[i].insertionPoint->releaseDeferred) {
|
while (context.results[i].insertionPoint->releaseDeferred) {
|
||||||
|
|||||||
Reference in new issue
Block a user