mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 01:05:45 +00:00
256c124f94
This was done by: This was done by applying: ``` diff --git a/python/mozbuild/mozbuild/code-analysis/mach_commands.py b/python/mozbuild/mozbuild/code-analysis/mach_commands.py index 789affde7bbf..fe33c4c7d4d1 100644 --- a/python/mozbuild/mozbuild/code-analysis/mach_commands.py +++ b/python/mozbuild/mozbuild/code-analysis/mach_commands.py @@ -2007,7 +2007,7 @@ class StaticAnalysis(MachCommandBase): from subprocess import Popen, PIPE, check_output, CalledProcessError diff_process = Popen(self._get_clang_format_diff_command(commit), stdout=PIPE) - args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format] + args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format, '-sort-includes'] if not output_file: args.append("-i") ``` Then running `./mach clang-format -c <commit-hash>` Then undoing that patch. Then running check_spidermonkey_style.py --fixup Then running `./mach clang-format` I had to fix four things: * I needed to move <utility> back down in GuardObjects.h because I was hitting obscure problems with our system include wrappers like this: 0:03.94 /usr/include/stdlib.h:550:14: error: exception specification in declaration does not match previous declaration 0:03.94 extern void *realloc (void *__ptr, size_t __size) 0:03.94 ^ 0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/malloc_decls.h:53:1: note: previous declaration is here 0:03.94 MALLOC_DECL(realloc, void*, void*, size_t) 0:03.94 ^ 0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozilla/mozalloc.h:22:32: note: expanded from macro 'MALLOC_DECL' 0:03.94 MOZ_MEMORY_API return_type name##_impl(__VA_ARGS__); 0:03.94 ^ 0:03.94 <scratch space>:178:1: note: expanded from here 0:03.94 realloc_impl 0:03.94 ^ 0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozmemory_wrap.h:142:41: note: expanded from macro 'realloc_impl' 0:03.94 #define realloc_impl mozmem_malloc_impl(realloc) Which I really didn't feel like digging into. * I had to restore the order of TrustOverrideUtils.h and related files in nss because the .inc files depend on TrustOverrideUtils.h being included earlier. * I had to add a missing include to RollingNumber.h * Also had to partially restore include order in JsepSessionImpl.cpp to avoid some -WError issues due to some static inline functions being defined in a header but not used in the rest of the compilation unit. Differential Revision: https://phabricator.services.mozilla.com/D60327 --HG-- extra : moz-landing-system : lando
189 lines
5.4 KiB
C++
189 lines
5.4 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
* vim: set ts=8 sts=2 et sw=2 tw=80:
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef js_UbiNodePostOrder_h
|
|
#define js_UbiNodePostOrder_h
|
|
|
|
#include "mozilla/Attributes.h"
|
|
#include "mozilla/Maybe.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "js/AllocPolicy.h"
|
|
#include "js/UbiNode.h"
|
|
#include "js/Utility.h"
|
|
#include "js/Vector.h"
|
|
|
|
namespace JS {
|
|
namespace ubi {
|
|
|
|
/**
|
|
* A post-order depth-first traversal of `ubi::Node` graphs.
|
|
*
|
|
* No GC may occur while an instance of `PostOrder` is live.
|
|
*
|
|
* The `NodeVisitor` type provided to `PostOrder::traverse` must have the
|
|
* following member:
|
|
*
|
|
* bool operator()(Node& node)
|
|
*
|
|
* The node visitor method. This method is called once for each `node`
|
|
* reachable from the start set in post-order.
|
|
*
|
|
* This visitor function should return true on success, or false if an error
|
|
* occurs. A false return value terminates the traversal immediately, and
|
|
* causes `PostOrder::traverse` to return false.
|
|
*
|
|
* The `EdgeVisitor` type provided to `PostOrder::traverse` must have the
|
|
* following member:
|
|
*
|
|
* bool operator()(Node& origin, Edge& edge)
|
|
*
|
|
* The edge visitor method. This method is called once for each outgoing
|
|
* `edge` from `origin` that is reachable from the start set.
|
|
*
|
|
* NB: UNLIKE NODES, THERE IS NO GUARANTEED ORDER IN WHICH EDGES AND THEIR
|
|
* ORIGINS ARE VISITED!
|
|
*
|
|
* This visitor function should return true on success, or false if an error
|
|
* occurs. A false return value terminates the traversal immediately, and
|
|
* causes `PostOrder::traverse` to return false.
|
|
*/
|
|
struct PostOrder {
|
|
private:
|
|
struct OriginAndEdges {
|
|
Node origin;
|
|
EdgeVector edges;
|
|
|
|
OriginAndEdges(const Node& node, EdgeVector&& edges)
|
|
: origin(node), edges(std::move(edges)) {}
|
|
|
|
OriginAndEdges(const OriginAndEdges& rhs) = delete;
|
|
OriginAndEdges& operator=(const OriginAndEdges& rhs) = delete;
|
|
|
|
OriginAndEdges(OriginAndEdges&& rhs)
|
|
: origin(rhs.origin), edges(std::move(rhs.edges)) {
|
|
MOZ_ASSERT(&rhs != this, "self-move disallowed");
|
|
}
|
|
|
|
OriginAndEdges& operator=(OriginAndEdges&& rhs) {
|
|
this->~OriginAndEdges();
|
|
new (this) OriginAndEdges(std::move(rhs));
|
|
return *this;
|
|
}
|
|
};
|
|
|
|
using Stack = js::Vector<OriginAndEdges, 256, js::SystemAllocPolicy>;
|
|
using Set = js::HashSet<Node, js::DefaultHasher<Node>, js::SystemAllocPolicy>;
|
|
|
|
JSContext* cx;
|
|
Set seen;
|
|
Stack stack;
|
|
#ifdef DEBUG
|
|
bool traversed;
|
|
#endif
|
|
|
|
private:
|
|
MOZ_MUST_USE bool fillEdgesFromRange(EdgeVector& edges,
|
|
js::UniquePtr<EdgeRange>& range) {
|
|
MOZ_ASSERT(range);
|
|
for (; !range->empty(); range->popFront()) {
|
|
if (!edges.append(std::move(range->front()))) {
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
MOZ_MUST_USE bool pushForTraversing(const Node& node) {
|
|
EdgeVector edges;
|
|
auto range = node.edges(cx, /* wantNames */ false);
|
|
return range && fillEdgesFromRange(edges, range) &&
|
|
stack.append(OriginAndEdges(node, std::move(edges)));
|
|
}
|
|
|
|
public:
|
|
// Construct a post-order traversal object.
|
|
//
|
|
// The traversal asserts that no GC happens in its runtime during its
|
|
// lifetime via the `AutoCheckCannotGC&` parameter. We do nothing with it,
|
|
// other than require it to exist with a lifetime that encloses our own.
|
|
PostOrder(JSContext* cx, AutoCheckCannotGC&)
|
|
: cx(cx),
|
|
seen(),
|
|
stack()
|
|
#ifdef DEBUG
|
|
,
|
|
traversed(false)
|
|
#endif
|
|
{
|
|
}
|
|
|
|
// Add `node` as a starting point for the traversal. You may add
|
|
// as many starting points as you like. Returns false on OOM.
|
|
MOZ_MUST_USE bool addStart(const Node& node) {
|
|
if (!seen.put(node)) {
|
|
return false;
|
|
}
|
|
return pushForTraversing(node);
|
|
}
|
|
|
|
// Traverse the graph in post-order, starting with the set of nodes passed
|
|
// to `addStart` and applying `onNode::operator()` for each node in the
|
|
// graph and `onEdge::operator()` for each edge in the graph, as described
|
|
// above.
|
|
//
|
|
// This should be called only once per instance of this class.
|
|
//
|
|
// Return false on OOM or error return from `onNode::operator()` or
|
|
// `onEdge::operator()`.
|
|
template <typename NodeVisitor, typename EdgeVisitor>
|
|
MOZ_MUST_USE bool traverse(NodeVisitor onNode, EdgeVisitor onEdge) {
|
|
#ifdef DEBUG
|
|
MOZ_ASSERT(!traversed, "Can only traverse() once!");
|
|
traversed = true;
|
|
#endif
|
|
|
|
while (!stack.empty()) {
|
|
auto& origin = stack.back().origin;
|
|
auto& edges = stack.back().edges;
|
|
|
|
if (edges.empty()) {
|
|
if (!onNode(origin)) {
|
|
return false;
|
|
}
|
|
stack.popBack();
|
|
continue;
|
|
}
|
|
|
|
Edge edge = std::move(edges.back());
|
|
edges.popBack();
|
|
|
|
if (!onEdge(origin, edge)) {
|
|
return false;
|
|
}
|
|
|
|
auto ptr = seen.lookupForAdd(edge.referent);
|
|
// We've already seen this node, don't follow its edges.
|
|
if (ptr) {
|
|
continue;
|
|
}
|
|
|
|
// Mark the referent as seen and follow its edges.
|
|
if (!seen.add(ptr, edge.referent) || !pushForTraversing(edge.referent)) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
};
|
|
|
|
} // namespace ubi
|
|
} // namespace JS
|
|
|
|
#endif // js_UbiNodePostOrder_h
|