mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-04 19:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/compiler-llvm/src/config.rs
View File

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

4
tests/compilers/wast.rs
View File

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