Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: tools/clang/blink_gc_plugin/BlinkGCPlugin.cpp

Issue 666473003: Blink GC plugin: Gracefully handle cyclic part objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/clang/blink_gc_plugin/tests/crash_on_invalid.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/clang/blink_gc_plugin/BlinkGCPlugin.cpp
diff --git a/tools/clang/blink_gc_plugin/BlinkGCPlugin.cpp b/tools/clang/blink_gc_plugin/BlinkGCPlugin.cpp
index 59cd41735a6e6572b6c56552e310a93b20e05a8e..d24d67ade4ff4c37aa2016b8d4d76567ea422652 100644
--- a/tools/clang/blink_gc_plugin/BlinkGCPlugin.cpp
+++ b/tools/clang/blink_gc_plugin/BlinkGCPlugin.cpp
@@ -572,6 +572,7 @@ class CheckTraceVisitor : public RecursiveASTVisitor<CheckTraceVisitor> {
class CheckGCRootsVisitor : public RecursiveEdgeVisitor {
public:
typedef std::vector<FieldPoint*> RootPath;
+ typedef std::set<RecordInfo*> VisitingSet;
typedef std::vector<RootPath> Errors;
CheckGCRootsVisitor() {}
@@ -594,6 +595,11 @@ class CheckGCRootsVisitor : public RecursiveEdgeVisitor {
if (edge->value()->record()->isUnion())
return;
+ // Prevent infinite regress for cyclic part objects.
+ if (visiting_set_.find(edge->value()) != visiting_set_.end())
+ return;
+
+ visiting_set_.insert(edge->value());
// If the value is a part object, then continue checking for roots.
for (Context::iterator it = context().begin();
it != context().end();
@@ -602,6 +608,7 @@ class CheckGCRootsVisitor : public RecursiveEdgeVisitor {
return;
}
ContainsGCRoots(edge->value());
+ visiting_set_.erase(edge->value());
}
void VisitPersistent(Persistent* edge) override {
@@ -615,6 +622,7 @@ class CheckGCRootsVisitor : public RecursiveEdgeVisitor {
protected:
RootPath current_;
+ VisitingSet visiting_set_;
Errors gc_roots_;
};
« no previous file with comments | « no previous file | tools/clang/blink_gc_plugin/tests/crash_on_invalid.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698