Merge cranelift 0.43.1

.azure-pipelines.yml

@@ -0,0 +1,180 @@
+name: $(Build.SourceBranch)-$(date:yyyy-MM-dd)$(rev:.r)
+trigger:
+  branches:
+    include:
+    - 'master'
+  tags:
+    include:
+    - '*'
+    exclude:
+      - 'dev'
+
+jobs:
+- job: rustfmt
+  pool:
+    vmImage: 'macos-10.14'
+  steps:
+  - checkout: self
+    submodules: true
+  - template: ci/azure-install-rust.yml
+  - script: rustup component add rustfmt
+    displayName: Add rustfmt
+  - script: cargo fmt --all -- --check
+    displayName: Check formatting
+  variables:
+    toolchain: stable
+
+# Smoke test to build docs on one builder, using OSX for now since it's the
+# fastest
+- job: docs
+  pool:
+    vmImage: 'macos-10.14'
+  steps:
+  - checkout: self
+    submodules: true
+  - template: ci/azure-install-rust.yml
+  - script: cargo doc
+    displayName: Build documentation
+  - script: cargo install cargo-deadlinks
+    displayName: Install cargo-deadlinks
+  - bash: |
+      find ./target/doc -maxdepth 1 -type d -name "cranelift*" | xargs -I{} cargo deadlinks --dir {}
+    displayName: Run cargo-deadlinks
+  variables:
+    toolchain: nightly
+
+- job: Test
+  strategy:
+    matrix:
+      windows-earliest:
+        imageName: 'vs2017-win2016'
+        toolchain: '1.37.0'
+      linux-earliest:
+        imageName: 'ubuntu-16.04'
+        toolchain: '1.37.0'
+      mac-earliest:
+        imageName: 'macos-10.14'
+        toolchain: '1.37.0'
+      mac-stable:
+        imageName: 'macos-10.14'
+        toolchain: stable
+      mac-beta:
+        imageName: 'macos-10.14'
+        toolchain: beta
+      mac-nightly:
+        imageName: 'macos-10.14'
+        toolchain: nightly
+
+  pool:
+    vmImage: $(imageName)
+
+  steps:
+    - checkout: self
+      submodules: true
+    - template: ci/azure-install-rust.yml
+
+    - script: cargo fetch
+      displayName: Fetch cargo dependencies
+
+    - script: cargo build
+      displayName: Cargo build
+
+    - bash: cargo test --all
+      displayName: Cargo test
+      env:
+        RUST_BACKTRACE: 1
+
+    # Ensure fuzzer works by running it with a single input
+    - bash: cargo install cargo-fuzz
+      displayName: Install cargo-fuzz
+      condition: and(succeeded(), eq(variables['toolchain'], 'nightly'))
+    - bash: |
+        fuzz_module="ffaefab69523eb11935a9b420d58826c8ea65c4c"
+        cargo fuzz run fuzz_translate_module \
+        "fuzz/corpus/fuzz_translate_module/$fuzz_module"
+      displayName: Run cargo-fuzz
+      env:
+        RUST_BACKTRACE: 1
+      condition: and(succeeded(), eq(variables['toolchain'], 'nightly'))
+
+- job: Fuzz_regression
+  displayName: Fuzz regression
+  pool:
+    vmImage: "ubuntu-16.04"
+  variables:
+    toolchain: nightly
+  steps:
+    - template: ci/azure-install-rust.yml
+    - bash: cargo install cargo-fuzz
+    - bash: ci/fuzzit.sh local-regression
+
+- job: Fuzz
+  condition: ne(variables['Build.Reason'], 'PullRequest')
+  pool:
+    vmImage: "ubuntu-16.04"
+  variables:
+    toolchain: nightly
+  steps:
+    - template: ci/azure-install-rust.yml
+    - bash: cargo install cargo-fuzz
+    - bash: ci/fuzzit.sh fuzzing
+      env:
+        FUZZIT_API_KEY: $(FUZZIT_API_KEY)
+
+- job: Build
+  strategy:
+    matrix:
+      windows:
+        imageName: 'vs2017-win2016'
+        # Statically link against msvcrt to produce slightly more portable
+        # binaries on Windows by reducing our binary compatibility requirements.
+        RUSTFLAGS: -Ctarget-feature=+crt-static
+      mac:
+        imageName: 'macos-10.14'
+        # Lower the deployment target from our build image in an attempt to
+        # build more portable binaries that run on older releases. Note that
+        # 10.9 here is arbitrarily chosen and just happens to be the lowest that
+        # works at this time. Raising this is probably fine.
+        MACOSX_DEPLOYMENT_TARGET: 10.9
+  variables:
+    toolchain: '1.37.0'
+  pool:
+    vmImage: $(imageName)
+  # We try to be compatible with beta and nightly, but they occasionally
+  # fail, so we don't allow them to hold up people using stable.
+  continueOnError: $[ne(variables['toolchain'], 'stable')]
+  steps:
+  - template: ci/azure-build-release.yml
+
+# Build the Linux release binary in an older Linux container (in this case
+# Centos 6)
+- job: Build_linux
+  variables:
+    toolchain: '1.37.0'
+  container:
+    image: centos:6
+    options: "--name ci-container -v /usr/bin/docker:/tmp/docker:ro"
+  steps:
+  # We're executing in the container as non-root but `yum` requires root. We
+  # need to install `sudo` but to do that we need `sudo`. Do a bit of a weird
+  # hack where we use the host `docker` executable to re-execute in our own
+  # container with the root user to install `sudo`
+  - bash: /tmp/docker exec -t -u 0 ci-container sh -c "yum install -y sudo"
+    displayName: Configure sudo
+
+  # See https://edwards.sdsu.edu/research/c11-on-centos-6/ for where these
+  # various commands came from.
+  - bash: |
+      set -e
+      sudo yum install -y centos-release-scl cmake xz
+      sudo yum install -y devtoolset-8-gcc devtoolset-8-binutils devtoolset-8-gcc-c++
+      echo "##vso[task.prependpath]/opt/rh/devtoolset-8/root/usr/bin"
+    displayName: Install system dependencies
+
+  # Delete `libstdc++.so` to force gcc to link against `libstdc++.a` instead.
+  # This is a hack and not the right way to do this, but it ends up doing the
+  # right thing for now.
+  - bash: sudo rm -f /opt/rh/devtoolset-8/root/usr/lib/gcc/x86_64-redhat-linux/8/libstdc++.so
+    displayName: Force a static libstdc++
+
+  - template: ci/azure-build-release.yml

CONTRIBUTING.md

@@ -50,7 +50,7 @@ things set in stone yet.
 
 We abide by our [Code of Conduct] and ask that you do as well.
 
-[Code of Conduct](CODE_OF_CONDUCT.md)
+[Code of Conduct]: CODE_OF_CONDUCT.md
 
 ## Coding Guidelines
 
@@ -84,14 +84,6 @@ build.
 
 [Rust Update Policy for Firefox]: https://wiki.mozilla.org/Rust_Update_Policy_for_Firefox#Schedule
 
-### Python
-
-Our Python code is checked with [mypy](http://mypy-lang.org/) and
-[flake8](http://flake8.pycqa.org/en/latest/); see the
-[check.sh](https://github.com/CraneStation/cranelift/blob/master/cranelift-codegen/meta-python/check.sh)
-file for details. The versions available in common package repositories such
-as Ubuntu or Homebrew typically work fine.
-
 ## Development Process
 
 We use [issues] for asking questions and tracking bugs and unimplemented

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "cranelift-tools"
 authors = ["The Cranelift Project Developers"]
-version = "0.31.0"
+version = "0.43.1"
 description = "Binaries for testing the Cranelift libraries"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://cranelift.readthedocs.io/"
@@ -19,33 +19,38 @@ path = "src/clif-util.rs"
 
 [dependencies]
 cfg-if = "0.1"
-cranelift-codegen = { path = "cranelift-codegen", version = "0.31.0" }
-cranelift-entity = { path = "cranelift-entity", version = "0.31.0" }
-cranelift-reader = { path = "cranelift-reader", version = "0.31.0" }
-cranelift-frontend = { path = "cranelift-frontend", version = "0.31.0" }
-cranelift-serde = { path = "cranelift-serde", version = "0.31.0", optional = true }
-cranelift-wasm = { path = "cranelift-wasm", version = "0.31.0", optional = true }
-cranelift-native = { path = "cranelift-native", version = "0.31.0" }
-cranelift-filetests = { path = "cranelift-filetests", version = "0.31.0" }
-cranelift-module = { path = "cranelift-module", version = "0.31.0" }
-cranelift-faerie = { path = "cranelift-faerie", version = "0.31.0" }
-cranelift-simplejit = { path = "cranelift-simplejit", version = "0.31.0" }
-cranelift-preopt = { path = "cranelift-preopt", version = "0.31.0" }
-cranelift = { path = "cranelift-umbrella", version = "0.31.0" }
+cranelift-codegen = { path = "cranelift-codegen", version = "0.43.1" }
+cranelift-entity = { path = "cranelift-entity", version = "0.43.1" }
+cranelift-reader = { path = "cranelift-reader", version = "0.43.1" }
+cranelift-frontend = { path = "cranelift-frontend", version = "0.43.1" }
+cranelift-serde = { path = "cranelift-serde", version = "0.43.1", optional = true }
+cranelift-wasm = { path = "cranelift-wasm", version = "0.43.1", optional = true }
+cranelift-native = { path = "cranelift-native", version = "0.43.1" }
+cranelift-filetests = { path = "cranelift-filetests", version = "0.43.1" }
+cranelift-module = { path = "cranelift-module", version = "0.43.1" }
+cranelift-faerie = { path = "cranelift-faerie", version = "0.43.1" }
+cranelift-object = { path = "cranelift-object", version = "0.43.1" }
+cranelift-simplejit = { path = "cranelift-simplejit", version = "0.43.1" }
+cranelift-preopt = { path = "cranelift-preopt", version = "0.43.1" }
+cranelift = { path = "cranelift-umbrella", version = "0.43.1" }
 filecheck = "0.4.0"
 clap = "2.32.0"
 serde = "1.0.8"
-term = "0.5.1"
-capstone = { version = "0.5.0", optional = true }
-wabt = { version = "0.7.0", optional = true }
-target-lexicon = "0.4.0"
+term = "0.6.1"
+capstone = { version = "0.6.0", optional = true }
+wabt = { version = "0.9.1", optional = true }
+target-lexicon = "0.8.1"
 pretty_env_logger = "0.3.0"
 file-per-thread-logger = "0.1.2"
+indicatif = "0.11.0"
+walkdir = "2.2"
 
 [features]
-default = ["disas", "wasm"]
+default = ["disas", "wasm", "cranelift-codegen/all-arch"]
 disas = ["capstone"]
 wasm = ["wabt", "cranelift-wasm"]
+basic-blocks = ["cranelift-codegen/basic-blocks", "cranelift-frontend/basic-blocks",
+"cranelift-wasm/basic-blocks", "cranelift-filetests/basic-blocks"]
 
 # We want debug symbols on release binaries by default since it allows profiling
 # tools to give more accurate information. We can always strip them out later if

README.md

@@ -8,9 +8,9 @@ into executable machine code.
 
 [![Documentation Status](https://readthedocs.org/projects/cranelift/badge/?version=latest)](https://cranelift.readthedocs.io/en/latest/?badge=latest)
 [![Travis Status](https://travis-ci.org/CraneStation/cranelift.svg?branch=master)](https://travis-ci.org/CraneStation/cranelift)
-[![Appveyor Status](https://ci.appveyor.com/api/projects/status/oub7wrrb59utuv8x?svg=true)](https://ci.appveyor.com/project/CraneStation/cranelift)
+[![Fuzzit Status](https://app.fuzzit.dev/badge?org_id=CraneStation)](https://app.fuzzit.dev/orgs/CraneStation/dashboard)
 [![Gitter chat](https://badges.gitter.im/CraneStation/CraneStation.svg)](https://gitter.im/CraneStation/Lobby)
-![Minimum rustc 1.34](https://img.shields.io/badge/rustc-1.34+-green.svg)
+![Minimum rustc 1.37](https://img.shields.io/badge/rustc-1.37+-green.svg)
 
 For more information, see [the
 documentation](https://cranelift.readthedocs.io/en/latest/?badge=latest).
@@ -53,8 +53,7 @@ needed before it would be ready for a production use case.
 
 Cranelift's APIs are not yet stable.
 
-Cranelift currently requires Rust 1.32 or later, and Python 2.7 or 3
-to build.
+Cranelift currently requires Rust 1.37 or later to build.
 
 Planned uses
 ------------