Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 5.6k
[mono][aot] Type load checks do not fail at compile time but produce a runtime exception#91261
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
Merged
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
78ce32e
Enable tests.
jandupej 3c32b67
When AOTing, type checks do not fail compilation but create a runtime…
jandupej 7676e00
Cleaned up type load error cleaning. TypeLoadException icall now has …
jandupej 611888b
Removed another instance of indiscriminate exception clearing.
jandupej 15b7aa5
Fixed build warning.
jandupej 90aa674
Using class const instead of string const. Reverted some compile to r…
jandupej d4b6c9f
White space.
jandupej bda12b3
Fixed build warning.
jandupej fbd3614
Trying to fix weird AOT errors, fixed type load throw function.
jandupej 805d6c4
Fixed build error.
jandupej 0b50974
Special handling for classes that are NULL.
jandupej 19c5155
Providing for a null klass when generating exception.
jandupej 83bcc30
Removed flow control directive from macro.
jandupej c6fe63b
Fixed stack corruption.
jandupej 9cb3d1a
Attempt to push the correct type onto the stack.
jandupej 025ed7a
Fixing uninitialized ins.
jandupej 4633336
Fixing ro_type.
jandupej 55db3c6
Initializing ins.
jandupej 4b35af0
Complex cases with type load failures replace method body with a throw.
jandupej ca7530d
Cleaning up superfluous code changes.
jandupej 9709a89
Restored sizeof cosntant on failed types.
jandupej File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -167,7 +167,7 @@ mono_tailcall_print (const char *format, ...) | ||
| #define TYPE_LOAD_ERROR(klass) do { \ | ||
| cfg->exception_ptr = klass; \ | ||
| LOAD_ERROR;\ | ||
| LOAD_ERROR;\ | ||
| } while (0) | ||
| #define CHECK_CFG_ERROR do {\ | ||
| @@ -2303,6 +2303,18 @@ emit_not_supported_failure (MonoCompile *cfg) | ||
| mono_emit_jit_icall (cfg, mono_throw_not_supported, NULL); | ||
| } | ||
| static void | ||
| emit_type_load_failure (MonoCompile* cfg, MonoClass* klass) | ||
| { | ||
| MonoInst* iargs[1]; | ||
| if (G_LIKELY (klass)) { | ||
| EMIT_NEW_CLASSCONST (cfg, iargs [0], klass); | ||
| } else { | ||
| EMIT_NEW_PCONST (cfg, iargs [0], NULL); | ||
| } | ||
| mono_emit_jit_icall (cfg, mono_throw_type_load, iargs); | ||
| } | ||
| static void | ||
| emit_invalid_program_with_msg (MonoCompile *cfg, MonoError *error_msg, MonoMethod *caller, MonoMethod *callee) | ||
| { | ||
| @@ -4963,6 +4975,15 @@ inline_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, | ||
| #define CHECK_UNVERIFIABLE(cfg) if (cfg->unverifiable) UNVERIFIED | ||
| #define CHECK_TYPELOAD(klass) if (!(klass) || mono_class_has_failure (klass)) TYPE_LOAD_ERROR ((klass)) | ||
| #define CLEAR_TYPELOAD_EXCEPTION(cfg) if (cfg->exception_type == MONO_EXCEPTION_TYPE_LOAD) { clear_cfg_error (cfg); cfg->exception_type = MONO_EXCEPTION_NONE; } | ||
| #define CLASS_HAS_FAILURE(klass) (!(klass) || mono_class_has_failure (klass)) | ||
| #define HANDLE_TYPELOAD_ERROR(cfg,klass) do { \ | ||
| if (!cfg->compile_aot) \ | ||
| TYPE_LOAD_ERROR ((klass)); \ | ||
| emit_type_load_failure (cfg, klass); \ | ||
| CLEAR_TYPELOAD_EXCEPTION (cfg); \ | ||
| } while (0) | ||
| /* offset from br.s -> br like opcodes */ | ||
| #define BIG_BRANCH_OFFSET 13 | ||
| @@ -5438,7 +5459,9 @@ emit_optimized_ldloca_ir (MonoCompile *cfg, guchar *ip, guchar *end, int local) | ||
| if ((ip = il_read_initobj (ip, end, &token)) && ip_in_bb (cfg, cfg->cbb, start + 1)) { | ||
| /* From the INITOBJ case */ | ||
| klass = mini_get_class (cfg->current_method, token, cfg->generic_context); | ||
| CHECK_TYPELOAD (klass); | ||
| if (CLASS_HAS_FAILURE (klass)) { | ||
| HANDLE_TYPELOAD_ERROR (cfg, klass); | ||
| } | ||
| type = mini_get_underlying_type (m_class_get_byval_arg (klass)); | ||
| emit_init_local (cfg, local, type, TRUE); | ||
| return ip; | ||
| @@ -6170,6 +6193,49 @@ emit_llvmonly_interp_entry (MonoCompile *cfg, MonoMethodHeader *header) | ||
| link_bblock (cfg, cfg->cbb, cfg->bb_exit); | ||
| } | ||
| static void | ||
| method_make_alwaysthrow_typeloadfailure (MonoCompile* cfg, MonoClass* klass) | ||
| { | ||
| // Get rid of all out-BBs from the entry BB. (all but init BB) | ||
| for (gint16 i = cfg->bb_entry->out_count - 1; i >= 0; i--) { | ||
| if (cfg->bb_entry->out_bb [i] != cfg->bb_init) { | ||
| mono_unlink_bblock (cfg, cfg->bb_entry, cfg->bb_entry->out_bb [i]); | ||
| mono_remove_bblock (cfg, cfg->bb_entry->out_bb [i]); | ||
| } | ||
| } | ||
| // Discard all out-BBs from the init BB. | ||
| for (gint16 i = cfg->bb_init->out_count - 1; i >= 0; i--) { | ||
| if (cfg->bb_init->out_bb [i] != cfg->bb_exit) { | ||
| mono_unlink_bblock (cfg, cfg->bb_init, cfg->bb_init->out_bb [i]); | ||
| mono_remove_bblock (cfg, cfg->bb_init->out_bb [i]); | ||
| } | ||
| } | ||
| // Maintain linked list consistency. This BB should have been added as the last, | ||
| // ignoring the ones that held actual method code. | ||
| cfg->cbb = cfg->bb_init; | ||
| // Create a new BB that only throws, link it after the entry. | ||
| MonoBasicBlock* bb; | ||
| NEW_BBLOCK (cfg, bb); | ||
| bb->cil_code = NULL; | ||
| bb->cil_length = 0; | ||
| cfg->cbb->next_bb = bb; | ||
| cfg->cbb = bb; | ||
| emit_type_load_failure (cfg, klass); | ||
| MonoInst* ins; | ||
| MONO_INST_NEW (cfg, ins, OP_NOT_REACHED); | ||
| MONO_ADD_INS (cfg->cbb, ins); | ||
| ADD_BBLOCK (cfg, bb); | ||
| mono_link_bblock (cfg, cfg->bb_init, bb); | ||
| mono_link_bblock (cfg, bb, cfg->bb_exit); | ||
| cfg->disable_inline = TRUE; | ||
| } | ||
| typedef union _MonoOpcodeParameter { | ||
| gint32 i32; | ||
| gint64 i64; | ||
| @@ -9871,6 +9937,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b | ||
| MonoType *ftype; | ||
| MonoInst *store_val = NULL; | ||
| MonoInst *thread_ins; | ||
| ins = NULL; | ||
| is_instance = (il_op == MONO_CEE_LDFLD || il_op == MONO_CEE_LDFLDA || il_op == MONO_CEE_STFLD); | ||
| if (is_instance) { | ||
| @@ -9898,8 +9965,28 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b | ||
| else { | ||
| klass = NULL; | ||
| field = mono_field_from_token_checked (image, token, &klass, generic_context, cfg->error); | ||
| if (!field) | ||
| CHECK_TYPELOAD (klass); | ||
| if (!field || CLASS_HAS_FAILURE (klass)) { | ||
| HANDLE_TYPELOAD_ERROR (cfg, klass); | ||
| // Reached only in AOT. Cannot turn a token into a class. We silence the compilation error | ||
| // and generate a runtime exception. | ||
| if (cfg->error->error_code == MONO_ERROR_BAD_IMAGE) | ||
| clear_cfg_error (cfg); | ||
| // We need to push a dummy value onto the stack, respecting the intended type. | ||
| if (il_op == MONO_CEE_LDFLDA || il_op == MONO_CEE_LDSFLDA) { | ||
| // Address is expected, push a null pointer. | ||
| EMIT_NEW_PCONST (cfg, *sp, NULL); | ||
jandupej marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| sp++; | ||
| } else if (il_op == MONO_CEE_LDFLD || il_op == MONO_CEE_LDSFLD) { | ||
| // An object is expected here. It may be impossible to correctly infer its type, | ||
| // we turn this entire method into a throw. | ||
| method_make_alwaysthrow_typeloadfailure (cfg, klass); | ||
| goto all_bbs_done; | ||
| } | ||
| break; | ||
| } | ||
| CHECK_CFG_ERROR; | ||
| } | ||
| if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_field (method, field)) | ||
| @@ -10365,8 +10452,11 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b | ||
| } | ||
| if (!is_const) { | ||
| MonoInst *load; | ||
| // This can happen in case of type load error. | ||
| if (!ins) | ||
| EMIT_NEW_PCONST (cfg, ins, 0); | ||
| MonoInst *load; | ||
| EMIT_NEW_LOAD_MEMBASE_TYPE (cfg, load, field->type, ins->dreg, 0); | ||
| load->flags |= ins_flag; | ||
| *sp++ = load; | ||
| @@ -11853,13 +11943,20 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b | ||
| inline_costs += 100000; | ||
| break; | ||
| case MONO_CEE_INITOBJ: | ||
| --sp; | ||
| klass = mini_get_class (method, token, generic_context); | ||
| CHECK_TYPELOAD (klass); | ||
| if (CLASS_HAS_FAILURE (klass)) { | ||
| HANDLE_TYPELOAD_ERROR (cfg, klass); | ||
| inline_costs += 10; | ||
| break; // reached only in AOT | ||
| } | ||
| --sp; | ||
| if (mini_class_is_reference (klass)) | ||
| MONO_EMIT_NEW_STORE_MEMBASE_IMM (cfg, OP_STORE_MEMBASE_IMM, sp [0]->dreg, 0, 0); | ||
| else | ||
| mini_emit_initobj (cfg, *sp, NULL, klass); | ||
| inline_costs += 1; | ||
| break; | ||
| case MONO_CEE_CONSTRAINED_: | ||
| @@ -11949,7 +12046,12 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b | ||
| EMIT_NEW_ICONST (cfg, ins, val); | ||
| } else { | ||
| klass = mini_get_class (method, token, generic_context); | ||
| CHECK_TYPELOAD (klass); | ||
| if (CLASS_HAS_FAILURE (klass)) { | ||
| HANDLE_TYPELOAD_ERROR (cfg, klass); | ||
| EMIT_NEW_ICONST(cfg, ins, 0); | ||
| *sp++ = ins; | ||
| break; | ||
| } | ||
| if (mini_is_gsharedvt_klass (klass)) { | ||
| ins = mini_emit_get_gsharedvt_info_klass (cfg, klass, MONO_RGCTX_INFO_CLASS_SIZEOF); | ||
| @@ -12002,6 +12104,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b | ||
| } | ||
| if (start_new_bblock != 1) | ||
| UNVERIFIED; | ||
| all_bbs_done: | ||
| cfg->cbb->cil_length = GPTRDIFF_TO_INT32 (ip - cfg->cbb->cil_code); | ||
| if (cfg->cbb->next_bb) { | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it necessary to remove dead blocks between the
bb_initandbb_exitwhich may not have a direct link to them?Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Possibly not; it seems that unreachable blocks are detected (and removed) without my explicitly doing it. This is the first iteration that seems to work locally, waiting for CI. I may be able to simplify it if CI turns out favorable.
EDIT: Are you aware of any unlinked blocks that should be kept?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change looks good to me. I was just curious whether the unreachable blocks are detected and removed.
Is it possible to skip the
bb_initand link thebb_entrywith the throw block?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had control flow issues when generating LLVM IR without the init block (which was empty no less). I'll see if it can be done.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
An alternative is to restart the compilation, there is already a mechanism to do that if llvm fails, etc. and emit the exception without compiling the rest of the IL.