[commit: ghc] master: Revert "rts: Compile with gcc -Og" (1e27209)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1e2720949a406f45b807fad69e7409777607f275/ghc

>---------------------------------------------------------------

commit 1e2720949a406f45b807fad69e7409777607f275
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon May 14 08:48:42 2018 -0400

    Revert "rts: Compile with gcc -Og"
    
    This reverts commit d4abd031f6e8c2fa01f8949f60d8a02cca513804.


>---------------------------------------------------------------

1e2720949a406f45b807fad69e7409777607f275
 rts/ghc.mk      | 2 +-
 rts/sm/Sanity.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rts/ghc.mk b/rts/ghc.mk
index 2976b0a..e96e147 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -153,7 +153,7 @@ rts_dist_$1_CC_OPTS := $$(GhcRtsCcOpts)
 # The per-way CC_OPTS
 ifneq "$$(findstring debug, $1)" ""
 rts_dist_$1_HC_OPTS += -O0
-rts_dist_$1_CC_OPTS += -fno-omit-frame-pointer -g -Og
+rts_dist_$1_CC_OPTS += -fno-omit-frame-pointer -g -O0
 endif
 
 ifneq "$$(findstring dyn, $1)" ""
diff --git a/rts/sm/Sanity.c b/rts/sm/Sanity.c
index 23a20b2..7a0ad16 100644
--- a/rts/sm/Sanity.c
+++ b/rts/sm/Sanity.c
@@ -481,7 +481,7 @@ checkCompactObjects(bdescr *bd)
     // before the actual closure
 
     for ( ; bd != NULL; bd = bd->link) {
-        StgCompactNFDataBlock *block, *last = NULL;
+        StgCompactNFDataBlock *block, *last;
         StgCompactNFData *str;
         StgWord totalW;