Merge #1101

1101: Update viper to 2022-07-21-0735 r=Aurel300 a=zgrannan This update is required to support an optimization to the enum encoding (https://github.com/viperproject/prusti-dev/tree/enum_body_optimization). Co-authored-by: Zack Grannan <zgrannan@protonmail.com>
viperproject · Jul 28, 2022 · a78a76d · a78a76d
2 parents 9eb1c8e + c43ee3f
commit a78a76d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/viper-toolchain b/viper-toolchain
@@ -1 +1 @@
-v-2022-07-01-0736
+v-2022-07-21-0735
diff --git a/viper/src/silicon_counterexample.rs b/viper/src/silicon_counterexample.rs
@@ -63,7 +63,7 @@ pub enum ModelEntry {
     LitInt(String),
     LitFloat(String),
     LitBool(bool),
-    LitPerm(f64),
+    LitPerm(String),
     Ref(String, FxHashMap<String, ModelEntry>),
     NullRef(String),
     RecursiveRef(String),
@@ -222,7 +222,8 @@ fn unwrap_model_entry<'a>(
         }
         "viper.silicon.reporting.LitPermEntry" => {
             let lit_perm_wrapper = silicon::reporting::LitPermEntry::with(env);
-            let value = jni.unwrap_result(lit_perm_wrapper.call_value(entry));
+            let value_scala = jni.unwrap_result(lit_perm_wrapper.call_value(entry));
+            let value = jni.to_string(value_scala);
             Some(ModelEntry::LitPerm(value))
         }
         "viper.silicon.reporting.RefEntry" => {