clang-format GCStrategy.cpp & GCRootLowering.cpp (NFC)

llvm-svn: 226196

llvm/lib/CodeGen/GCRootLowering.cpp

@@ -33,76 +33,70 @@ using namespace llvm;
 
 namespace {
 
-  /// LowerIntrinsics - This pass rewrites calls to the llvm.gcread or
+/// LowerIntrinsics - This pass rewrites calls to the llvm.gcread or
-  /// llvm.gcwrite intrinsics, replacing them with simple loads and stores as
+/// llvm.gcwrite intrinsics, replacing them with simple loads and stores as
-  /// directed by the GCStrategy. It also performs automatic root initialization
+/// directed by the GCStrategy. It also performs automatic root initialization
-  /// and custom intrinsic lowering.
+/// and custom intrinsic lowering.
-  class LowerIntrinsics : public FunctionPass {
+class LowerIntrinsics : public FunctionPass {
-    static bool NeedsDefaultLoweringPass(const GCStrategy &C);
+  static bool NeedsDefaultLoweringPass(const GCStrategy &C);
-    static bool NeedsCustomLoweringPass(const GCStrategy &C);
+  static bool NeedsCustomLoweringPass(const GCStrategy &C);
-    static bool CouldBecomeSafePoint(Instruction *I);
+  static bool CouldBecomeSafePoint(Instruction *I);
-    bool PerformDefaultLowering(Function &F, GCStrategy &Coll);
+  bool PerformDefaultLowering(Function &F, GCStrategy &Coll);
-    static bool InsertRootInitializers(Function &F,
+  static bool InsertRootInitializers(Function &F, AllocaInst **Roots,
-                                       AllocaInst **Roots, unsigned Count);
+                                     unsigned Count);
 
-  public:
+public:
-    static char ID;
+  static char ID;
 
-    LowerIntrinsics();
+  LowerIntrinsics();
-    const char *getPassName() const override;
+  const char *getPassName() const override;
-    void getAnalysisUsage(AnalysisUsage &AU) const override;
+  void getAnalysisUsage(AnalysisUsage &AU) const override;
 
-    bool doInitialization(Module &M) override;
+  bool doInitialization(Module &M) override;
-    bool runOnFunction(Function &F) override;
+  bool runOnFunction(Function &F) override;
-  };
+};
 
+/// GCMachineCodeAnalysis - This is a target-independent pass over the machine
+/// function representation to identify safe points for the garbage collector
+/// in the machine code. It inserts labels at safe points and populates a
+/// GCMetadata record for each function.
+class GCMachineCodeAnalysis : public MachineFunctionPass {
+  const TargetMachine *TM;
+  GCFunctionInfo *FI;
+  MachineModuleInfo *MMI;
+  const TargetInstrInfo *TII;
 
-  /// GCMachineCodeAnalysis - This is a target-independent pass over the machine
+  void FindSafePoints(MachineFunction &MF);
-  /// function representation to identify safe points for the garbage collector
+  void VisitCallPoint(MachineBasicBlock::iterator MI);
-  /// in the machine code. It inserts labels at safe points and populates a
+  MCSymbol *InsertLabel(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI,
-  /// GCMetadata record for each function.
+                        DebugLoc DL) const;
-  class GCMachineCodeAnalysis : public MachineFunctionPass {
-    const TargetMachine *TM;
-    GCFunctionInfo *FI;
-    MachineModuleInfo *MMI;
-    const TargetInstrInfo *TII;
 
-    void FindSafePoints(MachineFunction &MF);
+  void FindStackOffsets(MachineFunction &MF);
-    void VisitCallPoint(MachineBasicBlock::iterator MI);
-    MCSymbol *InsertLabel(MachineBasicBlock &MBB,
-                          MachineBasicBlock::iterator MI,
-                          DebugLoc DL) const;
 
-    void FindStackOffsets(MachineFunction &MF);
+public:
+  static char ID;
 
-  public:
+  GCMachineCodeAnalysis();
-    static char ID;
+  void getAnalysisUsage(AnalysisUsage &AU) const override;
-
-    GCMachineCodeAnalysis();
-    void getAnalysisUsage(AnalysisUsage &AU) const override;
-
-    bool runOnMachineFunction(MachineFunction &MF) override;
-  };
 
+  bool runOnMachineFunction(MachineFunction &MF) override;
+};
 }
 
 // -----------------------------------------------------------------------------
 
-INITIALIZE_PASS_BEGIN(LowerIntrinsics, "gc-lowering", "GC Lowering",
+INITIALIZE_PASS_BEGIN(LowerIntrinsics, "gc-lowering", "GC Lowering", false,
-                      false, false)
+                      false)
 INITIALIZE_PASS_DEPENDENCY(GCModuleInfo)
 INITIALIZE_PASS_END(LowerIntrinsics, "gc-lowering", "GC Lowering", false, false)
 
-FunctionPass *llvm::createGCLoweringPass() {
+FunctionPass *llvm::createGCLoweringPass() { return new LowerIntrinsics(); }
-  return new LowerIntrinsics();
-}
 
 char LowerIntrinsics::ID = 0;
 
-LowerIntrinsics::LowerIntrinsics()
+LowerIntrinsics::LowerIntrinsics() : FunctionPass(ID) {
-  : FunctionPass(ID) {
+  initializeLowerIntrinsicsPass(*PassRegistry::getPassRegistry());
-    initializeLowerIntrinsicsPass(*PassRegistry::getPassRegistry());
+}
-  }
 
 const char *LowerIntrinsics::getPassName() const {
   return "Lower Garbage Collection Instructions";
@@ -136,17 +130,18 @@ bool LowerIntrinsics::doInitialization(Module &M) {
 }
 
 bool LowerIntrinsics::InsertRootInitializers(Function &F, AllocaInst **Roots,
-                                                          unsigned Count) {
+                                             unsigned Count) {
   // Scroll past alloca instructions.
   BasicBlock::iterator IP = F.getEntryBlock().begin();
-  while (isa<AllocaInst>(IP)) ++IP;
+  while (isa<AllocaInst>(IP))
+    ++IP;
 
   // Search for initializers in the initial BB.
-  SmallPtrSet<AllocaInst*,16> InitedRoots;
+  SmallPtrSet<AllocaInst *, 16> InitedRoots;
   for (; !CouldBecomeSafePoint(IP); ++IP)
     if (StoreInst *SI = dyn_cast<StoreInst>(IP))
       if (AllocaInst *AI =
-          dyn_cast<AllocaInst>(SI->getOperand(1)->stripPointerCasts()))
+              dyn_cast<AllocaInst>(SI->getOperand(1)->stripPointerCasts()))
         InitedRoots.insert(AI);
 
   // Add root initializers.
@@ -154,9 +149,10 @@ bool LowerIntrinsics::InsertRootInitializers(Function &F, AllocaInst **Roots,
 
   for (AllocaInst **I = Roots, **E = Roots + Count; I != E; ++I)
     if (!InitedRoots.count(*I)) {
-      StoreInst* SI = new StoreInst(ConstantPointerNull::get(cast<PointerType>(
+      StoreInst *SI = new StoreInst(
-                        cast<PointerType>((*I)->getType())->getElementType())),
+          ConstantPointerNull::get(cast<PointerType>(
-                        *I);
+              cast<PointerType>((*I)->getType())->getElementType())),
+          *I);
       SI->insertAfter(*I);
       MadeChange = true;
     }
@@ -167,16 +163,13 @@ bool LowerIntrinsics::InsertRootInitializers(Function &F, AllocaInst **Roots,
 bool LowerIntrinsics::NeedsDefaultLoweringPass(const GCStrategy &C) {
   // Default lowering is necessary only if read or write barriers have a default
   // action. The default for roots is no action.
-  return !C.customWriteBarrier()
+  return !C.customWriteBarrier() || !C.customReadBarrier() ||
-      || !C.customReadBarrier()
+         C.initializeRoots();
-      || C.initializeRoots();
 }
 
 bool LowerIntrinsics::NeedsCustomLoweringPass(const GCStrategy &C) {
   // Custom lowering is only necessary if enabled for some action.
-  return C.customWriteBarrier()
+  return C.customWriteBarrier() || C.customReadBarrier() || C.customRoots();
-      || C.customReadBarrier()
-      || C.customRoots();
 }
 
 /// CouldBecomeSafePoint - Predicate to conservatively determine whether the
@@ -193,8 +186,8 @@ bool LowerIntrinsics::CouldBecomeSafePoint(Instruction *I) {
   // libcalls upon lowering (e.g., div i64 on a 32-bit platform), so instead
   // it is necessary to take a conservative approach.
 
-  if (isa<AllocaInst>(I) || isa<GetElementPtrInst>(I) ||
+  if (isa<AllocaInst>(I) || isa<GetElementPtrInst>(I) || isa<StoreInst>(I) ||
-      isa<StoreInst>(I) || isa<LoadInst>(I))
+      isa<LoadInst>(I))
     return false;
 
   // llvm.gcroot is safe because it doesn't do anything at runtime.
@@ -241,7 +234,7 @@ bool LowerIntrinsics::PerformDefaultLowering(Function &F, GCStrategy &S) {
   bool LowerRd = !S.customReadBarrier();
   bool InitRoots = S.initializeRoots();
 
-  SmallVector<AllocaInst*, 32> Roots;
+  SmallVector<AllocaInst *, 32> Roots;
 
   bool MadeChange = false;
   for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB) {
@@ -252,8 +245,8 @@ bool LowerIntrinsics::PerformDefaultLowering(Function &F, GCStrategy &S) {
         case Intrinsic::gcwrite:
           if (LowerWr) {
             // Replace a write barrier with a simple store.
-            Value *St = new StoreInst(CI->getArgOperand(0),
+            Value *St =
-                                      CI->getArgOperand(2), CI);
+                new StoreInst(CI->getArgOperand(0), CI->getArgOperand(2), CI);
             CI->replaceAllUsesWith(St);
             CI->eraseFromParent();
           }
@@ -271,8 +264,8 @@ bool LowerIntrinsics::PerformDefaultLowering(Function &F, GCStrategy &S) {
           if (InitRoots) {
             // Initialize the GC root, but do not delete the intrinsic. The
             // backend needs the intrinsic to flag the stack slot.
-            Roots.push_back(cast<AllocaInst>(
+            Roots.push_back(
-                              CI->getArgOperand(0)->stripPointerCasts()));
+                cast<AllocaInst>(CI->getArgOperand(0)->stripPointerCasts()));
           }
           break;
         default:
@@ -298,8 +291,7 @@ char &llvm::GCMachineCodeAnalysisID = GCMachineCodeAnalysis::ID;
 INITIALIZE_PASS(GCMachineCodeAnalysis, "gc-analysis",
                 "Analyze Machine Code For Garbage Collection", false, false)
 
-GCMachineCodeAnalysis::GCMachineCodeAnalysis()
+GCMachineCodeAnalysis::GCMachineCodeAnalysis() : MachineFunctionPass(ID) {}
-  : MachineFunctionPass(ID) {}
 
 void GCMachineCodeAnalysis::getAnalysisUsage(AnalysisUsage &AU) const {
   MachineFunctionPass::getAnalysisUsage(AU);
@@ -323,21 +315,21 @@ void GCMachineCodeAnalysis::VisitCallPoint(MachineBasicBlock::iterator CI) {
   ++RAI;
 
   if (FI->getStrategy().needsSafePoint(GC::PreCall)) {
-    MCSymbol* Label = InsertLabel(*CI->getParent(), CI, CI->getDebugLoc());
+    MCSymbol *Label = InsertLabel(*CI->getParent(), CI, CI->getDebugLoc());
     FI->addSafePoint(GC::PreCall, Label, CI->getDebugLoc());
   }
 
   if (FI->getStrategy().needsSafePoint(GC::PostCall)) {
-    MCSymbol* Label = InsertLabel(*CI->getParent(), RAI, CI->getDebugLoc());
+    MCSymbol *Label = InsertLabel(*CI->getParent(), RAI, CI->getDebugLoc());
     FI->addSafePoint(GC::PostCall, Label, CI->getDebugLoc());
   }
 }
 
 void GCMachineCodeAnalysis::FindSafePoints(MachineFunction &MF) {
-  for (MachineFunction::iterator BBI = MF.begin(),
+  for (MachineFunction::iterator BBI = MF.begin(), BBE = MF.end(); BBI != BBE;
-                                 BBE = MF.end(); BBI != BBE; ++BBI)
+       ++BBI)
-    for (MachineBasicBlock::iterator MI = BBI->begin(),
+    for (MachineBasicBlock::iterator MI = BBI->begin(), ME = BBI->end();
-                                     ME = BBI->end(); MI != ME; ++MI)
+         MI != ME; ++MI)
       if (MI->isCall())
         VisitCallPoint(MI);
 }

llvm/lib/CodeGen/GCStrategy.cpp

@@ -16,13 +16,7 @@
 
 using namespace llvm;
 
-GCStrategy::GCStrategy() :
+GCStrategy::GCStrategy()
-  UseStatepoints(false),
+    : UseStatepoints(false), NeededSafePoints(0), CustomReadBarriers(false),
-  NeededSafePoints(0),
+      CustomWriteBarriers(false), CustomRoots(false), CustomSafePoints(false),
-  CustomReadBarriers(false),
+      InitRoots(true), UsesMetadata(false) {}
-  CustomWriteBarriers(false),
-  CustomRoots(false),
-  CustomSafePoints(false),
-  InitRoots(true),
-  UsesMetadata(false)
-{}