Merge pull request #18 from fitzgen/sort-subsequences

Sort subsequences

Author: fitzgen

Cargo.toml

@@ -18,7 +18,7 @@ license = "Apache-2.0/MIT"
 name = "source-map-mappings"
 readme = "./README.md"
 repository = "https://github.com/fitzgen/source-map-mappings"
-version = "0.4.0"
+version = "0.5.0"
 
 [badges.travis-ci]
 repository = "fitzgen/source-map-mappings"

source-map-mappings-wasm-api/Cargo.toml

@@ -5,13 +5,13 @@ license = "Apache-2.0/MIT"
 name = "source-map-mappings-wasm-api"
 readme = "../README.md"
 repository = "https://github.com/fitzgen/source-map-mappings"
-version = "0.4.0"
+version = "0.5.0"
 
 [badges.travis-ci]
 repository = "fitzgen/source-map-mappings"
 
 [dependencies]
-source-map-mappings = { version = "0.4.0", path = ".." }
+source-map-mappings = { version = "0.5.0", path = ".." }
 
 [features]
 profiling = []

source-map-mappings-wasm-api/build.py

@@ -94,13 +94,17 @@ def wasm_gc(args, wasm_path):
  return out_path
 
 SHOULD_SNIP = [
- re.compile(r".*(std|core)(9|::)panicking"),
- re.compile(r".*(std|core)(3|::)fmt"),
- re.compile(r".*core(6|::)option(13|::)expect_failed"),
- re.compile(r".*core(3|::)str(16|::)slice_error_fail"),
- re.compile(r".*core(6|::)result(13|::)unwrap_failed"),
- re.compile(r".*std(6|::)thread(5|::)local(2|::)os(13|::)destroy_value"),
- re.compile(r".*std(2|::)io(5|::)Write"),
+ re.compile(r".*(std|core)(9|::)panicking.*"),
+ re.compile(r".*(std|core)(3|::)fmt.*"),
+ re.compile(r".*core(6|::)option(13|::)expect_failed.*"),
+ re.compile(r".*core(5|::)slice(\d+|::)slice_index_.*_fail.*"),
+ re.compile(r".*core(3|::)str(\d+|::)slice_.*_fail.*"),
+ re.compile(r".*core(6|::)result(13|::)unwrap_failed.*"),
+ re.compile(r".*std(6|::)thread(5|::)local.*"),
+ re.compile(r".*std(2|::)io(5|::).*"),
+ re.compile(r"__.*2"),
+ re.compile(r".*(std|core)(5|::)error.*"),
+ re.compile(r".*(std|core)(3|::)any(3|::)Any.*"),
 ]
 
 def wasm_snip(args, wasm_path):
@@ -109,7 +113,7 @@ def wasm_snip(args, wasm_path):
 
  out_path = add_path_ext_prefix(wasm_path, "snip")
 
- private_functions = run(["wasm-nm", "-p", "-j", wasm_path]).splitlines()
+ private_functions = run(["wasm-nm", "-j", wasm_path]).splitlines()
 
  snip_functions = set()
  for snip in SHOULD_SNIP:

source-map-mappings-wasm-api/src/lib.rs

@@ -353,7 +353,7 @@ pub extern "C" fn by_original_location(mappings: *mut Mappings<Observer>) {
  let this_scope = ();
  let mappings = unsafe { mappings_mut(&this_scope, mappings) };
 
- mappings.by_original_location().iter().for_each(|m| unsafe {
+ mappings.by_original_location().for_each(|m| unsafe {
  invoke_mapping_callback(m);
  });
 }

source-map-mappings-wasm-api/who-calls.py

@@ -146,6 +146,8 @@ def print_callers(reversed_call_graph, args, function=None, depth=0, seen=set())
 
  print_callers(reversed_call_graph, args, function=caller, depth=depth+1, seen=seen)
 
+ seen.remove(function)
+
 def main():
  args = parser.parse_args()
  disassembly = disassemble(args)

src/comparators.rs

@@ -46,15 +46,15 @@ macro_rules! compare {
  }
 }
 
-/// Sort mappings by their generated locations, breaking ties by their original
-/// locations.
+/// Sort mappings by their generated location, but don't compare generated
+/// lines. This is useful for when we know that all mappings being sorted have
+/// the same generated line number.
 #[derive(Debug)]
-pub struct ByGeneratedLocation;
+pub struct ByGeneratedTail;
 
-impl ComparatorFunction<Mapping> for ByGeneratedLocation {
+impl ComparatorFunction<Mapping> for ByGeneratedTail {
  #[inline]
  fn compare(a: &Mapping, b: &Mapping) -> Ordering {
- compare!(a.generated_line, b.generated_line);
  compare!(a.generated_column, b.generated_column);
  ByOriginalLocation::compare(&a.original, &b.original)
  }
@@ -89,3 +89,33 @@ impl ComparatorFunction<OriginalLocation> for ByOriginalLocation {
  a.name.cmp(&b.name)
  }
 }
+
+/// Assuming mappings are in the same original source, sort mappings by their
+/// original locations, breaking ties by their generated locations.
+#[derive(Debug)]
+pub struct ByOriginalLocationSameSource;
+
+impl ComparatorFunction<Mapping> for ByOriginalLocationSameSource {
+ #[inline]
+ fn compare(a: &Mapping, b: &Mapping) -> Ordering {
+ let c = ByOriginalLocationSameSource::compare(&a.original, &b.original);
+ match c {
+ Ordering::Less | Ordering::Greater => c,
+ Ordering::Equal => {
+ compare!(a.generated_line, b.generated_line);
+ compare!(a.generated_column, b.generated_column);
+ Ordering::Equal
+ }
+ }
+ }
+}
+
+impl ComparatorFunction<OriginalLocation> for ByOriginalLocationSameSource {
+ #[inline]
+ fn compare(a: &OriginalLocation, b: &OriginalLocation) -> Ordering {
+ debug_assert_eq!(a.source, b.source);
+ compare!(a.original_line, b.original_line);
+ compare!(a.original_column, b.original_column);
+ a.name.cmp(&b.name)
+ }
+}