[commit: ghc] master: llvmGen: Eliminate duplicate definition (d0fc761)

[git at git.haskell.org]

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

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

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

commit d0fc76189b9b709378849d071814342983c3a5df
Author: Gabor Greif <ggreif at gmail.com>
Date:   Tue Nov 20 14:35:09 2018 +0100

    llvmGen: Eliminate duplicate definition
    
    remove local


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

d0fc76189b9b709378849d071814342983c3a5df
 compiler/llvmGen/LlvmCodeGen/Base.hs | 3 +--
 compiler/llvmGen/LlvmCodeGen/Ppr.hs  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler/llvmGen/LlvmCodeGen/Base.hs b/compiler/llvmGen/LlvmCodeGen/Base.hs
index 6e20da4..21b45e5 100644
--- a/compiler/llvmGen/LlvmCodeGen/Base.hs
+++ b/compiler/llvmGen/LlvmCodeGen/Base.hs
@@ -474,8 +474,7 @@ generateExternDecls = do
 -- @$def@ suffix, and generate the appropriate alias.
 aliasify :: LMGlobal -> LlvmM [LMGlobal]
 aliasify (LMGlobal var val) = do
-    let i8Ptr = LMPointer (LMInt 8)
-        LMGlobalVar lbl ty link sect align const = var
+    let LMGlobalVar lbl ty link sect align const = var
 
         defLbl = lbl `appendFS` fsLit "$def"
         defVar = LMGlobalVar defLbl ty Internal sect align const
diff --git a/compiler/llvmGen/LlvmCodeGen/Ppr.hs b/compiler/llvmGen/LlvmCodeGen/Ppr.hs
index 2a8340b..c1378aa 100644
--- a/compiler/llvmGen/LlvmCodeGen/Ppr.hs
+++ b/compiler/llvmGen/LlvmCodeGen/Ppr.hs
@@ -89,7 +89,7 @@ pprLlvmCmmDecl (CmmProc mb_info entry_lbl live (ListGraph blks))
                                 Alias
            alias = LMGlobal funVar
                             (Just $ LMBitc (LMStaticPointer defVar)
-                                           (LMPointer $ LMInt 8))
+                                           i8Ptr)
 
        return (ppLlvmGlobal alias $+$ ppLlvmFunction fun', [])