fixed and defaulted back to sancov 8bit instrumentation

instead of cloning the `COUNTER_MAPS` Vec, it is now drained into a new Vec pass to the Observer

Author: Michael Rodler

cargo-libafl/Cargo.toml

@@ -30,5 +30,6 @@ rustc_version = "0.4"
 xdg = "2.4"
 
 [features]
+default = ["sancov_8bit"]
 sancov_8bit = []
 tui = []

cargo-libafl/build.rs

@@ -51,6 +51,7 @@ fn main() {
     cmd.current_dir(&out_path)
         .env("CARGO_TARGET_DIR", out_path.join("rt"))
         .arg("build");
+    cmd.arg("--no-default-features");
     #[cfg(feature = "sancov_8bit")]
     cmd.arg("--features").arg("sancov_8bit");
     #[cfg(feature = "tui")]

cargo-libafl/cargo-libafl-runtime/Cargo.toml

@@ -33,5 +33,6 @@ crate-type = ["staticlib", "rlib"]
 path = "runtime.rs"
 
 [features]
+default = [ "sancov_8bit" ]
 sancov_8bit = []
 tui = []

cargo-libafl/cargo-libafl-runtime/runtime.rs

@@ -16,7 +16,7 @@ use libafl::{
         rands::StdRand,
         shmem::{ShMemProvider, StdShMemProvider},
         tuples::{tuple_list, Merge},
-        AsSlice,
+        AsMutSlice, AsSlice,
     },
     corpus::{self, CachedOnDiskCorpus, Corpus, OnDiskCorpus},
     events::EventConfig,
@@ -36,6 +36,7 @@ use libafl::{
         StdMOptMutator,
     },
     observers::{BacktraceObserver, TimeObserver},
+    prelude::OwnedMutSlice,
     schedulers::{
         powersched::PowerSchedule, IndexesLenTimeMinimizerScheduler, PowerQueueScheduler,
     },
@@ -218,9 +219,8 @@ pub fn main() {
 
         #[cfg(feature = "sancov_8bit")]
         let edges_observer = {
-            let edges = unsafe { &mut COUNTERS_MAPS };
-            // TODO: is the call to edges.clone here the reason for breaking sancov_8bit?
-            HitcountsIterableMapObserver::new(MultiMapObserver::new("edges", edges.clone()))
+            let edges = unsafe { COUNTERS_MAPS.drain(0..).collect() };
+            HitcountsIterableMapObserver::new(MultiMapObserver::new("edges", edges))
         };
 
         #[cfg(not(feature = "sancov_8bit"))]