Remove the GET_NAME macro

Author: harendra-kumar

src/Fusion/Plugin/Common.h

@@ -1,10 +1,8 @@
 #if MIN_VERSION_ghc(9,0,0)
 #define UNIQ_FM UniqFM Name [Fuse]
-#define GET_NAME getName
 #define FMAP_SND fmap snd $
 #else
 #define UNIQ_FM UniqFM [Fuse]
-#define GET_NAME getName
 #define FMAP_SND
 #endif
 

src/Fusion/Plugin/Common.hs

@@ -193,7 +193,7 @@ altsContainsAnn _ _ [] = Nothing
 altsContainsAnn _ _ ((ALT_CONSTR(DEFAULT,_,_)):[]) =
     debug 2 "Case trivial default" Nothing
 altsContainsAnn dflags isInteresting (bndr@(ALT_CONSTR(DataAlt dcon,_,_)):_) =
-    let name = GET_NAME $ dataConTyCon dcon
+    let name = getName $ dataConTyCon dcon
         mesg = "Case DataAlt type " ++ showWithUnique dflags name
     in if isInteresting name
        then debug 2 (mesg ++ " annotated") (Just bndr)
@@ -359,7 +359,7 @@ binderAnnKeys b = nm : [base | Just base <- [DL.stripPrefix "$w" nm]]
 
     where
 
-    nm = getOccString (GET_NAME b)
+    nm = getOccString (getName b)
 
 -- | The source-level display name of a binder: its occurrence name with any
 -- @$w@ worker prefix stripped. The worker/wrapper transformation renames an
@@ -370,7 +370,7 @@ binderDisplayName b = fromMaybe nm (DL.stripPrefix "$w" nm)
 
     where
 
-    nm = getOccString (GET_NAME b)
+    nm = getOccString (getName b)
 
 -------------------------------------------------------------------------------
 -- Transitive closure of a binding

src/Fusion/Plugin/Fuse.hs

@@ -264,7 +264,7 @@ letBndrsThatAreCases dflags anns bind = goLet [] bind
 needInlineTyCon :: CoreBind -> UNIQ_FM -> TyCon -> InlineNeed ()
 needInlineTyCon parent anns tycon =
     let parentBndr = getNonRecBinder parent
-    in case lookupUFM anns (GET_NAME tycon) of
+    in case lookupUFM anns (getName tycon) of
         Just _ | hasNoInlineBinder parentBndr -> InlineBlockedByNoInline tycon
         Just _ | not (hasInlineBinder parentBndr) -> InlineNeeded ()
         _ -> InlineNotNeeded
@@ -353,23 +353,23 @@ constructingBinders anns bind = goLet [] bind
 -- unchanged if the binder is not annotated.
 augmentFuseTypes :: UNIQ_FM -> FUSE_TYPES_FM -> CoreBndr -> CoreM (UNIQ_FM)
 augmentFuseTypes anns fuseTypesAnns b =
-    case Map.lookup (getOccString (GET_NAME b)) fuseTypesAnns of
+    case Map.lookup (getOccString (getName b)) fuseTypesAnns of
         Nothing -> return anns
         Just (FuseTypes ns) -> do
             names <- resolveTHNames ns
             return $ plusUFM anns (listToUFM (map (\n -> (n, [Fuse])) names))
 
 removeFuseTypes :: UNIQ_FM -> NO_FUSE_TYPES_FM -> CoreBndr -> CoreM (UNIQ_FM)
 removeFuseTypes anns noFuseTypesAnns b =
-    case Map.lookup (getOccString (GET_NAME b)) noFuseTypesAnns of
+    case Map.lookup (getOccString (getName b)) noFuseTypesAnns of
         Nothing -> return anns
         Just (NoFuseTypes ns) -> do
             names <- resolveTHNames ns
             return $ delListFromUFM anns names
 
 removeFuse :: UNIQ_FM -> NO_FUSE_FM -> CoreBndr -> UNIQ_FM
 removeFuse anns noFuseAnns b =
-    case Map.lookup (getOccString (GET_NAME b)) noFuseAnns of
+    case Map.lookup (getOccString (getName b)) noFuseAnns of
         Nothing -> anns
         Just NoFuse -> emptyUFM
 

src/Fusion/Plugin/Inspect.hs

@@ -120,7 +120,7 @@ containsAnns dflags isInteresting bind =
                         -- type) -- otherwise e.g. `case s of _ -> ...` with `s
                         -- :: SPEC` would go unreported.
                         case tyConAppTyConPicky_maybe (varType caseBndr) of
-                            Just tycon | isInteresting (GET_NAME tycon) ->
+                            Just tycon | isInteresting (getName tycon) ->
                                 [(parents, CaseScrut caseBndr)]
                             _ -> []
         in hit ++ binders
@@ -139,7 +139,7 @@ containsAnns dflags isInteresting bind =
             hit = case fun of
                 Var i
                     | Just dcon <- isDataConId_maybe i
-                    , isInteresting (GET_NAME (dataConTyCon dcon)) ->
+                    , isInteresting (getName (dataConTyCon dcon)) ->
                         [(parents, Constr i)]
                 _ -> []
         in hit ++ go parents fun ++ concatMap (go parents) args
@@ -149,7 +149,7 @@ containsAnns dflags isInteresting bind =
     -- Check if the Var is of the type of a data constructor of interest
     go parents (Var i) =
         case tyConAppTyConPicky_maybe (varType i) of
-            Just tycon | isInteresting (GET_NAME tycon) ->
+            Just tycon | isInteresting (getName tycon) ->
                 [(parents, Constr i)]
             _ -> []
 
@@ -166,11 +166,11 @@ containsAnns dflags isInteresting bind =
 
 contextTyConName :: Context -> Maybe Name
 contextTyConName (CaseAlt (ALT_CONSTR(DataAlt dcon,_,_))) =
-    Just (GET_NAME $ dataConTyCon dcon)
+    Just (getName $ dataConTyCon dcon)
 contextTyConName (CaseAlt _) = Nothing
 contextTyConName (CaseScrut bndr) =
-    GET_NAME <$> tyConAppTyConPicky_maybe (varType bndr)
-contextTyConName (Constr con) = GET_NAME <$> constrTyCon con
+    getName <$> tyConAppTyConPicky_maybe (varType bndr)
+contextTyConName (Constr con) = getName <$> constrTyCon con
 
 -- | Like 'contextTyConName' but yields the fully-qualified @Module.Type@ name
 -- (via 'qualifiedTyConName') used in reports rather than the raw 'Name'.
@@ -444,7 +444,7 @@ reportInspected dflags reportMode anns pmAnns allocAnns allBinds (NonRec b _)
                     stale = filter (`notElem` present) allowed
                 unless (null stale) $
                     putMsgS $ "fusion-plugin: "
-                            ++ getOccString (GET_NAME b)
+                            ++ getOccString (getName b)
                             ++ ": redundant " ++ label
                             ++ " entries (safe to remove): ["
                             ++ DL.intercalate ", " (map qualifiedName stale)
@@ -453,7 +453,7 @@ reportInspected dflags reportMode anns pmAnns allocAnns allBinds (NonRec b _)
     terse ni results =
         let names = DL.nub (mapMaybe (contextQualifiedName . snd) results)
         in putMsgS $ "fusion-plugin: "
-                   ++ getOccString (GET_NAME b)
+                   ++ getOccString (getName b)
                    ++ ": found " ++ niForbidLabel ni ++ " ["
                    ++ DL.intercalate ", " names ++ "]"
 
@@ -576,7 +576,7 @@ reportInspectedClasses dflags reportMode classAnns allBinds (NonRec b _) =
     report _ hits =
         let names = DL.nub (map qualifiedTyConName hits)
         in putMsgS $ "fusion-plugin: "
-                   ++ getOccString (GET_NAME b)
+                   ++ getOccString (getName b)
                    ++ ": found forbidden type classes ["
                    ++ DL.intercalate ", " names ++ "]"
 
@@ -588,7 +588,7 @@ reportInspectedClasses dflags reportMode classAnns allBinds (NonRec b _) =
             stale = filter (`notElem` present) allowed
         unless (null stale) $
             putMsgS $ "fusion-plugin: "
-                    ++ getOccString (GET_NAME b)
+                    ++ getOccString (getName b)
                     ++ ": redundant PermitTypeClasses entries (safe to remove): ["
                     ++ DL.intercalate ", " (map qualifiedName stale) ++ "]"
     warnStalePermitted _ _ = return ()