Merge pull request #17 from defuse/taylor-patches

Changes I needed to get Siderophile working

analyze.sh

@@ -62,7 +62,7 @@ echo "trawling source code of dependencies for unsafety"
 
 echo "generating LLVM bitcode for the callgraph"
 cargo clean
-RUSTFLAGS="-C lto=no -C opt-level=0 -C debuginfo=2 -C inline-threshold=9999 --emit=llvm-bc" \
+RUSTFLAGS="-C lto=no -C opt-level=0 -C debuginfo=2 --emit=llvm-bc" \
 CARGO_INCREMENTAL="0" \
 cargo rustc --lib -- --emit=llvm-bc
 

script/find_unsafe_nodes.py

@@ -93,4 +93,4 @@ def main():
         main()
     except IndexError:
         print("USAGE:")
-        print(f"{sys.argv[0]} [GRAPH_FILE] [SIDEROPHILE_OUTPUT]")
+        print("{} [GRAPH_FILE] [SIDEROPHILE_OUTPUT]".format(sys.argv[0]))

script/trace_unsafety.py

@@ -51,7 +51,7 @@ def taint_node(graph, node, name):
 # Propagates a taint through a graph breadth-first
 def propagate_taint(graph, start_node):
     start_label = graph.nodes[start_node].get("label")
-    log.info(f"taint starting at {start_label}")
+    log.info("taint starting at {}".format(start_label))
 
     # We mark all the nodes touched in this function call and then increment all their badnesses by
     # 1 at the very end. This way we don't double-count nodes in cycles. This function is never
@@ -115,7 +115,7 @@ def main():
             taint_file.read().splitlines(),
         ))
 
-        log.debug(f"node_labels_to_taint == {node_labels_to_taint}")
+        log.debug("node_labels_to_taint == {}".format(node_labels_to_taint))
 
         node_ids_to_taint = set()
         for n in iter(graph):
@@ -126,7 +126,7 @@ def main():
             label = graph.nodes[n]["label"]
             # See if this is a node we should taint
             if label in node_labels_to_taint:
-                log.debug(f"found a node we want to taint: {n}")
+                log.debug("found a node we want to taint: {}".format(n))
                 node_ids_to_taint.add(n)
 
         for n in node_ids_to_taint:
@@ -156,4 +156,4 @@ def main():
         main()
     except IndexError:
         print("USAGE:")
-        print(f"{sys.argv[0]} [GRAPH_FILE] [TAINT_FILE] [FILTER_PREFIX]")
+        print("{} [GRAPH_FILE] [TAINT_FILE] [FILTER_PREFIX]".format(sys.argv[0]))

setup.sh

@@ -13,7 +13,11 @@ fi
 echo "building siderophile"
 cargo build --release
 
-if !(hash rustfilt) 2>/dev/null; then
+# Where to look for `rustfilt`. If CARGO_HOME is set, use $CARGO_HOME/bin.
+# Otherwise, use ~/.cargo/bin
+CARGO_BIN=${CARGO_HOME:-~/.cargo}/bin
+
+if !(PATH="$PATH:$CARGO_BIN" hash rustfilt) 2>/dev/null; then
     echo "didn't find rustfilt, installing it now"
     cargo install rustfilt
 fi