diff --git a/3rd/cjson/src/cJSONw.cpp b/3rd/cjson/src/cJSONw.cpp index 2bdf8849..3a7e8a56 100644 --- a/3rd/cjson/src/cJSONw.cpp +++ b/3rd/cjson/src/cJSONw.cpp @@ -49,7 +49,7 @@ static cJSON* convert_python_object_to_cjson(PyObject* obj, VM* vm){ return cJSON_CreateNull(); } vm->TypeError(fmt("unrecognized type ", obj_type_name(vm, obj_t).escape())); - PK_UNREACHABLE(); + PK_UNREACHABLE() } diff --git a/examples/abort-the-vm/user_config.h b/examples/abort-the-vm/user_config.h index 8f927c05..fedbc760 100644 --- a/examples/abort-the-vm/user_config.h +++ b/examples/abort-the-vm/user_config.h @@ -66,10 +66,10 @@ #ifdef _MSC_VER #define PK_ENABLE_COMPUTED_GOTO 0 -#define PK_UNREACHABLE() __assume(0) +#define PK_UNREACHABLE() __assume(0); #else #define PK_ENABLE_COMPUTED_GOTO 1 -#define PK_UNREACHABLE() __builtin_unreachable() +#define PK_UNREACHABLE() __builtin_unreachable(); #endif diff --git a/include/pocketpy/namedict.h b/include/pocketpy/namedict.h index 1ce3c4af..bbfcc95c 100644 --- a/include/pocketpy/namedict.h +++ b/include/pocketpy/namedict.h @@ -49,7 +49,7 @@ struct SmallNameDict{ return true; } ) - PK_UNREACHABLE(); + PK_UNREACHABLE() } V try_get(K key) const { diff --git a/src/ceval.cpp b/src/ceval.cpp index 6268044b..db8ff190 100644 --- a/src/ceval.cpp +++ b/src/ceval.cpp @@ -854,7 +854,7 @@ __NEXT_STEP:; #undef DISPATCH_OP_CALL #undef CEVAL_STEP /**********************************************************************/ - PK_UNREACHABLE(); + PK_UNREACHABLE() }catch(HandledException){ continue; }catch(UnhandledException){ diff --git a/src/expr.cpp b/src/expr.cpp index 96ef64ca..eae7961b 100644 --- a/src/expr.cpp +++ b/src/expr.cpp @@ -111,7 +111,7 @@ namespace pkpy{ return index; } } - PK_UNREACHABLE(); + PK_UNREACHABLE() } int CodeEmitContext::add_func_decl(FuncDecl_ decl){ @@ -626,7 +626,7 @@ namespace pkpy{ case TK("!="): ctx->emit_(OP_COMPARE_NE, BC_NOARG, line); break; case TK(">"): ctx->emit_(OP_COMPARE_GT, BC_NOARG, line); break; case TK(">="): ctx->emit_(OP_COMPARE_GE, BC_NOARG, line); break; - default: PK_UNREACHABLE(); + default: PK_UNREACHABLE() } // [b, RES] int index = ctx->emit_(OP_SHORTCUT_IF_FALSE_OR_POP, BC_NOARG, line); diff --git a/src/vm.cpp b/src/vm.cpp index 7b688c12..f0bc4ab5 100644 --- a/src/vm.cpp +++ b/src/vm.cpp @@ -466,7 +466,7 @@ i64 VM::py_hash(PyObject* obj){ } if(has_custom_eq){ TypeError(fmt("unhashable type: ", ti->name.escape())); - PK_UNREACHABLE(); + PK_UNREACHABLE() }else{ return PK_BITS(obj); }