From de9ccfa63fc373d20759275c5eb5f3706869def3 Mon Sep 17 00:00:00 2001 From: Jay Krell Date: Wed, 16 Oct 2019 11:56:09 -0700 Subject: [PATCH] [cxx][netcore] Goto around init. (#17348) [cxx][netcore] Goto around init. --- mono/metadata/assembly-load-context.c | 3 ++- mono/mini/simd-intrinsics-netcore.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mono/metadata/assembly-load-context.c b/mono/metadata/assembly-load-context.c index 25e4e4437b6..7c972cffeac 100644 --- a/mono/metadata/assembly-load-context.c +++ b/mono/metadata/assembly-load-context.c @@ -129,7 +129,8 @@ invoke_resolve_method (MonoMethod *resolve_method, MonoAssemblyLoadContext *alc, goto_if_nok (error, leave); MonoReflectionAssemblyHandle assm; - gpointer gchandle = GUINT_TO_POINTER (alc->gchandle); + gpointer gchandle; + gchandle = GUINT_TO_POINTER (alc->gchandle); gpointer args [2]; args [0] = &gchandle; args [1] = MONO_HANDLE_RAW (aname_obj); diff --git a/mono/mini/simd-intrinsics-netcore.c b/mono/mini/simd-intrinsics-netcore.c index 072d3c59d0d..292a8329de9 100644 --- a/mono/mini/simd-intrinsics-netcore.c +++ b/mono/mini/simd-intrinsics-netcore.c @@ -301,7 +301,7 @@ emit_sys_numerics_vector_t (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSig ins = emit_simd_ins (cfg, klass, OP_XZERO, -1, -1); return emit_xcompare (cfg, klass, etype, ins, ins); } - case SN_get_Item: + case SN_get_Item: { if (!COMPILE_LLVM (cfg)) return NULL; MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, args [1]->dreg, len); @@ -338,6 +338,7 @@ emit_sys_numerics_vector_t (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSig mini_type_to_eval_stack_type (cfg, etype, ins); MONO_ADD_INS (cfg->cbb, ins); return ins; + } case SN_ctor: if (fsig->param_count == 1 && mono_metadata_type_equal (fsig->params [0], etype)) { int dreg = load_simd_vreg (cfg, cmethod, args [0], NULL); -- 2.11.4.GIT