Proposed fix for dotnet#32085

briansull · briansull · commit 169c24eeafb0 · 2020-02-24T17:20:26.000-08:00
diff --git a/src/coreclr/src/jit/emitxarch.cpp b/src/coreclr/src/jit/emitxarch.cpp
@@ -2835,7 +2835,7 @@ void emitter::emitHandleMemOp(GenTreeIndir* indir, instrDesc* id, insFormat fmt,
 
         // Either not generating relocatable code, or addr must be an icon handle, or the
         // constant is zero (which we won't generate a relocation for).
-        assert(!emitComp->opts.compReloc || memBase->IsIconHandle() || memBase->IsIntegralConst(0));
+        assert(!emitComp->opts.compReloc || memBase->IsIconHandle() || memBase->IsIntegralConst(0) || memBase->AsIntConCommon()->FitsInAddrBase(emitComp));
 
         if (memBase->AsIntConCommon()->AddrNeedsReloc(emitComp))
         {

Original file line number	Diff line number	Diff line change
`@@ -2835,7 +2835,7 @@ void emitter::emitHandleMemOp(GenTreeIndir* indir, instrDesc* id, insFormat fmt,`
`2835`	`2835`
`2836`	`2836`	`// Either not generating relocatable code, or addr must be an icon handle, or the`
`2837`	`2837`	`// constant is zero (which we won't generate a relocation for).`
`2838`		`- assert(!emitComp->opts.compReloc \|\| memBase->IsIconHandle() \|\| memBase->IsIntegralConst(0));`
	`2838`	`+ assert(!emitComp->opts.compReloc \|\| memBase->IsIconHandle() \|\| memBase->IsIntegralConst(0) \|\| memBase->AsIntConCommon()->FitsInAddrBase(emitComp));`
`2839`	`2839`
`2840`	`2840`	`if (memBase->AsIntConCommon()->AddrNeedsReloc(emitComp))`
`2841`	`2841`	`{`