From a8b4f2a1e49ecfd7bfa378d0961c0ae892a6cedf Mon Sep 17 00:00:00 2001
From: Mark McCaskey <mark@wasmer.io>
Date: Wed, 26 Feb 2020 13:25:41 -0800
Subject: [PATCH] Update clif option string, fix table parsing to match AnyFunc

---
 lib/clif-backend/src/lib.rs   | 2 +-
 lib/runtime-core/src/parse.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/clif-backend/src/lib.rs b/lib/clif-backend/src/lib.rs
index a989b2e43..95fd334a4 100644
--- a/lib/clif-backend/src/lib.rs
+++ b/lib/clif-backend/src/lib.rs
@@ -40,7 +40,7 @@ fn get_isa() -> Box<dyn isa::TargetIsa> {
     let flags = {
         let mut builder = settings::builder();
         builder.set("opt_level", "speed_and_size").unwrap();
-        builder.set("jump_tables_enabled", "false").unwrap();
+        builder.set("enable_jump_tables", "false").unwrap();
 
         if cfg!(test) || cfg!(debug_assertions) {
             builder.set("enable_verifier", "true").unwrap();
diff --git a/lib/runtime-core/src/parse.rs b/lib/runtime-core/src/parse.rs
index 49686721d..16a4a0808 100644
--- a/lib/runtime-core/src/parse.rs
+++ b/lib/runtime-core/src/parse.rs
@@ -300,7 +300,7 @@ pub fn read_module<
             }
             ParserState::BeginElementSectionEntry {
                 table: ElemSectionEntryTable::Active(table_index_raw),
-                ty: WpType::Func,
+                ty: WpType::AnyFunc,
             } => {
                 let table_index = TableIndex::new(table_index_raw as usize);
                 let mut elements: Option<Vec<FuncIndex>> = None;