diff options
| author | Bruce Forstall <brucefo@microsoft.com> | 2016-09-09 14:58:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-09 14:58:08 -0700 |
| commit | ff53de3231bcd43e077f6a446c01520c2ed1bbea (patch) | |
| tree | 97f41553e04fe94119a4e7d8d7f6e2728b5150af | |
| parent | 4033fe5af8469d3e0c81d99cd2fa842c5baea57c (diff) | |
| parent | 08f3ae19c6e07e6772ace96706012ed87e4e6f2e (diff) | |
| download | coreclr-ff53de3231bcd43e077f6a446c01520c2ed1bbea.tar.gz coreclr-ff53de3231bcd43e077f6a446c01520c2ed1bbea.tar.bz2 coreclr-ff53de3231bcd43e077f6a446c01520c2ed1bbea.zip | |
Merge pull request #7114 from BruceForstall/Fix7100
Fix #7100
| -rw-r--r-- | src/jit/emitxarch.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/jit/emitxarch.cpp b/src/jit/emitxarch.cpp index d43f766ee8..6b7777a853 100644 --- a/src/jit/emitxarch.cpp +++ b/src/jit/emitxarch.cpp @@ -2499,8 +2499,9 @@ void emitter::emitHandleMemOp(GenTreeIndir* indir, instrDesc* id, insFormat fmt, // Absolute addresses marked as contained should fit within the base of addr mode. assert(memBase->AsIntConCommon()->FitsInAddrBase(emitComp)); - // Either not generating relocatable code or addr must be an icon handle - assert(!emitComp->opts.compReloc || memBase->IsIconHandle()); + // 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)); if (memBase->AsIntConCommon()->AddrNeedsReloc(emitComp)) { |