Revert "Ignore multi-value errors on LLVM too, for now."

This reverts commit 486dedc601.
This commit is contained in:
Nick Lewycky
2020-06-01 11:51:13 -07:00
parent a5f40c2375
commit 14188bed44
2 changed files with 3 additions and 6 deletions

View File

@@ -68,10 +68,7 @@ pub struct LLVMConfig {
impl LLVMConfig {
/// Creates a new configuration object with the default configuration
/// specified.
pub fn new(mut features: Features, target: Target) -> Self {
// Override the default multi-value switch
features.multi_value = false;
pub fn new(features: Features, target: Target) -> Self {
let operating_system =
if target.triple().operating_system == wasmer_compiler::OperatingSystem::Darwin {
// LLVM detects static relocation + darwin + 64-bit and

View File

@@ -47,8 +47,8 @@ fn run_wast(wast_path: &str, compiler: &str) -> anyhow::Result<()> {
// native.set_deterministic_prefixer(native_prefixer);
// let store = Store::new(Arc::new(native));
let mut wast = Wast::new_with_spectest(store);
if compiler == "singlepass" || compiler == "llvm" {
// We don't support multivalue yet in singlepass or llvm
if compiler == "singlepass" {
// We don't support multivalue yet in singlepass
wast.allow_instantiation_failures(&[
"Validation error: invalid result arity: func type returns multiple values",
"Validation error: blocks, loops, and ifs accept no parameters when multi-value is not enabled"