From 2d45ce2bb848808b4725ec20236a469da4ef5897 Mon Sep 17 00:00:00 2001
From: Chris Fallin <cfallin@mozilla.com>
Date: Wed, 15 Jul 2020 14:46:20 -0700
Subject: [PATCH] Enable reftypes tests on aarch64.

With #1852, we now have support for reference types in the new backend
framework generally, and on aarch64 in particular. This PR removes the
test-ignore directive for reftypes tests on this platform.

Closes #1886.
---
 build.rs          |  6 ------
 tests/all/func.rs |  9 ---------
 tests/all/main.rs | 10 ++--------
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/build.rs b/build.rs
index 95c4b03b6351..42634a6b84e6 100644
--- a/build.rs
+++ b/build.rs
@@ -202,12 +202,6 @@ fn ignore(testsuite: &str, testname: &str, strategy: &str) -> bool {
             // to be a big chunk of work to implement them all there!
             ("simd", _) if target.contains("aarch64") => return true,
 
-            // TODO(#1886): Ignore reference types tests if this isn't x64,
-            // because Cranelift only supports reference types on x64.
-            ("reference_types", _) => {
-                return env::var("CARGO_CFG_TARGET_ARCH").unwrap() != "x86_64";
-            }
-
             _ => {}
         },
         _ => panic!("unrecognized strategy"),
diff --git a/tests/all/func.rs b/tests/all/func.rs
index 76019e70b514..f0cbbd943e58 100644
--- a/tests/all/func.rs
+++ b/tests/all/func.rs
@@ -121,9 +121,6 @@ fn signatures_match() {
 }
 
 #[test]
-// Note: Cranelift only supports refrerence types (used in the wasm in this
-// test) on x64.
-#[cfg(target_arch = "x86_64")]
 fn import_works() -> Result<()> {
     static HITS: AtomicUsize = AtomicUsize::new(0);
 
@@ -444,9 +441,6 @@ fn func_write_nothing() -> anyhow::Result<()> {
 }
 
 #[test]
-// Note: Cranelift only supports refrerence types (used in the wasm in this
-// test) on x64.
-#[cfg(target_arch = "x86_64")]
 fn return_cross_store_value() -> anyhow::Result<()> {
     let wasm = wat::parse_str(
         r#"
@@ -479,9 +473,6 @@ fn return_cross_store_value() -> anyhow::Result<()> {
 }
 
 #[test]
-// Note: Cranelift only supports refrerence types (used in the wasm in this
-// test) on x64.
-#[cfg(target_arch = "x86_64")]
 fn pass_cross_store_arg() -> anyhow::Result<()> {
     let mut config = Config::new();
     config.wasm_reference_types(true);
diff --git a/tests/all/main.rs b/tests/all/main.rs
index e8f952ff7436..7b45cb6bea4b 100644
--- a/tests/all/main.rs
+++ b/tests/all/main.rs
@@ -3,7 +3,9 @@ mod custom_signal_handler;
 mod debug;
 mod externals;
 mod func;
+mod funcref;
 mod fuzzing;
+mod gc;
 mod globals;
 mod iloop;
 mod import_calling_export;
@@ -19,14 +21,6 @@ mod traps;
 mod use_after_drop;
 mod wast;
 
-// TODO(#1886): Cranelift only supports reference types on x64.
-#[cfg(target_arch = "x86_64")]
-mod funcref;
-#[cfg(target_arch = "x86_64")]
-mod gc;
-
-/// A helper to compile a module in a new store with reference types enabled.
-#[cfg(target_arch = "x86_64")]
 pub(crate) fn ref_types_module(
     source: &str,
 ) -> anyhow::Result<(wasmtime::Store, wasmtime::Module)> {