Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update charon #443

Merged
merged 1 commit into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charon-pin
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This is the commit from https://github.com/AeneasVerif/charon that should be used with this version of aeneas.
5651efc286dcee58e8e96be869980a40a26af95c
368d17ccff13e3c09d4438c74a1227a0d6f6577e
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions src/interp/InterpreterExpressions.ml
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ let eval_operand_no_reorganize (config : config) (span : Meta.span)
^ "\n"));
(* Evaluate *)
match op with
| Constant cv -> (
| Constant cv -> begin
match cv.value with
| CLiteral lit -> (
(* FIXME: the str type is not in [literal_type] *)
Expand Down Expand Up @@ -447,7 +447,11 @@ let eval_operand_no_reorganize (config : config) (span : Meta.span)
(cv, ctx, cc_comp cc cf)
| CFnPtr _ ->
craise __FILE__ __LINE__ span
"Function pointers are not supported yet")
"Function pointers are not supported yet"
| CRawMemory _ ->
craise __FILE__ __LINE__ span
"Raw memory cannot be interpreted by the interpreter"
end
| Copy p ->
(* Access the value *)
let access = Read in
Expand Down