fix rebase whitespace

lambdageek · lambdageek · commit 517978e97876 · 2022-11-15T18:47:10.000-05:00
diff --git a/src/mono/mono/mini/interp/interp.c b/src/mono/mono/mini/interp/interp.c
@@ -7623,6 +7623,7 @@ MINT_IN_CASE(MINT_BRTRUE_I8_SP) ZEROP_SP(gint64, !=); MINT_IN_BREAK;
 			MINT_IN_BREAK;
 		}
 #endif
+
 #if !USE_COMPUTED_GOTO
 		default:
 			interp_error_xsx ("Unimplemented opcode: %04x %s at 0x%x\n", *ip, mono_interp_opname (*ip), GPTRDIFF_TO_INT (ip - frame->imethod->code));
diff --git a/src/mono/mono/mini/interp/mintops.def b/src/mono/mono/mini/interp/mintops.def
@@ -806,5 +806,3 @@ OPDEF(MINT_METADATA_UPDATE_LDFLDA, "metadata_update.ldflda", 5, 1, 1, MintOpTwoS
 OPDEF(MINT_TIER_PREPARE_JITERPRETER, "tier_prepare_jiterpreter", 3, 0, 0, MintOpInt)
 OPDEF(MINT_TIER_NOP_JITERPRETER, "tier_nop_jiterpreter", 3, 0, 0, MintOpInt)
 OPDEF(MINT_TIER_ENTER_JITERPRETER, "tier_enter_jiterpreter", 3, 0, 0, MintOpInt)
-
-
diff --git a/src/mono/mono/mini/interp/transform.c b/src/mono/mono/mini/interp/transform.c
@@ -6229,7 +6229,6 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
 						td->ip += 5;
 						break;
 					}
-						
 					int opcode = MINT_STFLD_I1 + mt - MINT_TYPE_I1;
 #ifdef NO_UNALIGNED_ACCESS
 					if ((mt == MINT_TYPE_I8 || mt == MINT_TYPE_R8) && field->offset % SIZEOF_VOID_P != 0)

Original file line number	Diff line number	Diff line change
`@@ -7623,6 +7623,7 @@ MINT_IN_CASE(MINT_BRTRUE_I8_SP) ZEROP_SP(gint64, !=); MINT_IN_BREAK;`
`7623`	`7623`	`MINT_IN_BREAK;`
`7624`	`7624`	`}`
`7625`	`7625`	`#endif`
	`7626`	`+`
`7626`	`7627`	`#if !USE_COMPUTED_GOTO`
`7627`	`7628`	`default:`
`7628`	`7629`	`interp_error_xsx ("Unimplemented opcode: %04x %s at 0x%x\n", ip, mono_interp_opname (ip), GPTRDIFF_TO_INT (ip - frame->imethod->code));`
Original file line number	Diff line number	Diff line change
`@@ -6229,7 +6229,6 @@ generate_code (TransformData td, MonoMethod method, MonoMethodHeader *header,`
`6229`	`6229`	`td->ip += 5;`
`6230`	`6230`	`break;`
`6231`	`6231`	`}`
`6232`		`-`
`6233`	`6232`	`int opcode = MINT_STFLD_I1 + mt - MINT_TYPE_I1;`
`6234`	`6233`	`#ifdef NO_UNALIGNED_ACCESS`
`6235`	`6234`	`if ((mt == MINT_TYPE_I8 \|\| mt == MINT_TYPE_R8) && field->offset % SIZEOF_VOID_P != 0)`