[commit: ghc] wip/T15155a: take this out for now (c578ed4)
git at git.haskell.org
git at git.haskell.org
Thu Dec 27 17:01:26 UTC 2018
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/T15155a
Link : http://ghc.haskell.org/trac/ghc/changeset/c578ed433fc7d35ee9dbaffda8646339e6c8d57e/ghc
>---------------------------------------------------------------
commit c578ed433fc7d35ee9dbaffda8646339e6c8d57e
Author: Gabor Greif <ggreif at gmail.com>
Date: Fri Dec 21 11:36:21 2018 +0100
take this out for now
>---------------------------------------------------------------
c578ed433fc7d35ee9dbaffda8646339e6c8d57e
compiler/llvmGen/LlvmCodeGen/Data.hs | 2 +-
compiler/nativeGen/PPC/Ppr.hs | 2 +-
compiler/nativeGen/SPARC/Ppr.hs | 2 +-
compiler/nativeGen/X86/Ppr.hs | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/compiler/llvmGen/LlvmCodeGen/Data.hs b/compiler/llvmGen/LlvmCodeGen/Data.hs
index a936972..a8b977d 100644
--- a/compiler/llvmGen/LlvmCodeGen/Data.hs
+++ b/compiler/llvmGen/LlvmCodeGen/Data.hs
@@ -45,7 +45,7 @@ linkage lbl = if externallyVisibleCLabel lbl
genLlvmData :: (Section, CmmStatics) -> LlvmM LlvmData
-- See note [emit-time elimination of static indirections]
genLlvmData (_, Statics alias [CmmStaticLit (CmmLabel lbl), CmmStaticLit ind, a, b])
- | ASSERT( (a,b) == (0,0) ) lbl == mkIndStaticInfoLabel
+ | {-ASSERT( (a,b) == (0,0) )-} lbl == mkIndStaticInfoLabel
, let labelInd (CmmLabelOff l _) = Just l
labelInd (CmmLabel l) = Just l
labelInd _ = Nothing
diff --git a/compiler/nativeGen/PPC/Ppr.hs b/compiler/nativeGen/PPC/Ppr.hs
index 5e714df..77c7ee3 100644
--- a/compiler/nativeGen/PPC/Ppr.hs
+++ b/compiler/nativeGen/PPC/Ppr.hs
@@ -126,7 +126,7 @@ pprBasicBlock info_env (BasicBlock blockid instrs)
pprDatas :: CmmStatics -> SDoc
-- See note [emit-time elimination of static indirections]
pprDatas (Statics alias [CmmStaticLit (CmmLabel lbl), CmmStaticLit ind, a, b])
- | ASSERT( (a,b) == (0,0) ) lbl == mkIndStaticInfoLabel
+ | {-ASSERT( (a,b) == (0,0) )-} lbl == mkIndStaticInfoLabel
, let labelInd (CmmLabelOff l _) = Just l
labelInd (CmmLabel l) = Just l
labelInd _ = Nothing
diff --git a/compiler/nativeGen/SPARC/Ppr.hs b/compiler/nativeGen/SPARC/Ppr.hs
index dc24d00..a5348e5 100644
--- a/compiler/nativeGen/SPARC/Ppr.hs
+++ b/compiler/nativeGen/SPARC/Ppr.hs
@@ -109,7 +109,7 @@ pprBasicBlock info_env (BasicBlock blockid instrs)
pprDatas :: CmmStatics -> SDoc
-- See note [emit-time elimination of static indirections]
pprDatas (Statics alias [CmmStaticLit (CmmLabel lbl), CmmStaticLit ind, a, b])
- | ASSERT( (a,b) == (0,0) ) lbl == mkIndStaticInfoLabel
+ | {-ASSERT( (a,b) == (0,0) )-} lbl == mkIndStaticInfoLabel
, let labelInd (CmmLabelOff l _) = Just l
labelInd (CmmLabel l) = Just l
labelInd _ = Nothing
diff --git a/compiler/nativeGen/X86/Ppr.hs b/compiler/nativeGen/X86/Ppr.hs
index 8b9e001..b763a32 100644
--- a/compiler/nativeGen/X86/Ppr.hs
+++ b/compiler/nativeGen/X86/Ppr.hs
@@ -156,7 +156,7 @@ pprBasicBlock info_env (BasicBlock blockid instrs)
pprDatas :: (Alignment, CmmStatics) -> SDoc
-- See note [emit-time elimination of static indirections]
pprDatas (_, Statics alias [CmmStaticLit (CmmLabel lbl), CmmStaticLit ind, a, b])
- | ASSERT( (a,b) == (0,0) ) lbl == mkIndStaticInfoLabel
+ | {-ASSERT( (a,b) == (0,0) )-} lbl == mkIndStaticInfoLabel
, let labelInd (CmmLabelOff l _) = Just l
labelInd (CmmLabel l) = Just l
labelInd _ = Nothing
More information about the ghc-commits
mailing list