Make CorePrep.tryEtaReducePrep and CoreUtils.tryEtaReduce line up

Simon PJ says he prefers this fix to #17429 over banning eta-reduction
for jumps entirely. Sure enough, this also works.

Test case: simplCore/should_compile/T17429.hs
22 jobs for master
Status Job ID Name Coverage
  Lint
canceled #209723
lint
lint-linters

canceled #209726
lint
lint-submods-branch

canceled #209724
lint
lint-testsuite

canceled #209725
lint
typecheck-testsuite

 
  Quick Build
canceled #209727
x86_64-linux
hadrian-ghc-in-ghci

 
  Build
canceled #209730
x86_64-linux
release-x86_64-linux-deb9-dwarf

canceled #209729
x86_64-linux
validate-x86_64-linux-deb9-debug

canceled #209728
x86_64-linux
validate-x86_64-linux-deb9-hadrian

 
  Full Build
canceled #209733
aarch64-linux allowed to fail
validate-aarch64-linux-deb9

canceled #209734
armv7-linux allowed to fail
validate-armv7-linux-deb9

canceled #209735
x86_64-linux
validate-i386-linux-deb9

canceled #209732
x86_64-darwin
validate-x86_64-darwin

canceled #209736
x86_64-linux
validate-x86_64-linux-deb9-integer-simple

canceled #209731
x86_64-linux
validate-x86_64-linux-deb9-unreg-hadrian

canceled #209737
x86_64-linux
validate-x86_64-linux-fedora27

canceled #209739
x86_64-windows allowed to fail
validate-x86_64-windows

canceled #209738
x86_64-windows allowed to fail
validate-x86_64-windows-hadrian

 
  Cleanup
canceled #209740
x86_64-darwin
cleanup-darwin

 
  Packaging
canceled #209741
x86_64-linux allowed to fail
doc-tarball

 
  Testing
canceled #209742
x86_64-linux allowed to fail manual
hackage

canceled #209743
x86_64-linux
perf-nofib

 
  Deploy
canceled #209744
x86_64-linux allowed to fail
pages