diff options
author | Ömer Sinan Ağacan <omeragacan@gmail.com> | 2018-07-04 09:12:01 +0300 |
---|---|---|
committer | Ömer Sinan Ağacan <omeragacan@gmail.com> | 2018-07-04 09:12:27 +0300 |
commit | 15bb4e0b6c08b1f8f5511f04af14242f13833ed1 (patch) | |
tree | 2e50184512814b19d4c17d1e0f3ab7a14767e2fa /testsuite/tests/ghci.debugger | |
parent | 6cb189d1d465d18879b6a4b107fbdce53b2ebf56 (diff) | |
download | haskell-15bb4e0b6c08b1f8f5511f04af14242f13833ed1.tar.gz |
Fix nptr field alignment in RtClosureInspect
`extractSubTerms` (which is extracting pointer and non-pointer fields of a
closure) was computing the alignment incorrectly when aligning a 64-bit value
(e.g. a Double) on i386 by aligning it to 64-bits instead of to word size
(32-bits). This is documented in `mkVirtHeapOffsetsWithPadding`:
> Align the start offset (eg, 2-byte value should be 2-byte aligned).
> But not more than to a word.
Fixes #15061
Test Plan:
Validated on both 32-bit and 64-bit. 32-bit fails with various unrelated stat
failures, but no actual test failures.
Reviewers: hvr, bgamari
Reviewed By: bgamari
Subscribers: simonpj, rwbarton, thomie, carter
GHC Trac Issues: #15061
Differential Revision: https://phabricator.haskell.org/D4906
Diffstat (limited to 'testsuite/tests/ghci.debugger')
-rw-r--r-- | testsuite/tests/ghci.debugger/scripts/all.T | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/testsuite/tests/ghci.debugger/scripts/all.T b/testsuite/tests/ghci.debugger/scripts/all.T index 88acdb0a25..f2e2658d49 100644 --- a/testsuite/tests/ghci.debugger/scripts/all.T +++ b/testsuite/tests/ghci.debugger/scripts/all.T @@ -22,8 +22,7 @@ test('print019', extra_files(['../Test.hs']), ghci_script, ['print019.script']) test('print020', extra_files(['../HappyTest.hs']), ghci_script, ['print020.script']) test('print021', normal, ghci_script, ['print021.script']) test('print022', - [when(arch('powerpc64'), expect_broken(14455)), - when(wordsize(32), expect_broken(15061))], + [when(arch('powerpc64'), expect_broken(14455))], ghci_script, ['print022.script']) test('print023', extra_files(['../Test.hs']), ghci_script, ['print023.script']) test('print024', extra_files(['../Test.hs']), ghci_script, ['print024.script']) |