Address nits

Author: skatrak

llvm/include/llvm/Transforms/Utils/CodeExtractor.h

@@ -98,15 +98,15 @@ class CodeExtractorAnalysisCache {
     BranchProbabilityInfo *BPI;
     AssumptionCache *AC;
 
-    // A block outside of the extraction set where any intermediate
-    // allocations will be placed inside. If this is null, allocations
-    // will be placed in the entry block of the function.
+    /// A block outside of the extraction set where any intermediate
+    /// allocations will be placed inside. If this is null, allocations
+    /// will be placed in the entry block of the function.
     BasicBlock *AllocationBlock;
 
-    // If true, varargs functions can be extracted.
+    /// If true, varargs functions can be extracted.
     bool AllowVarArgs;
 
-    // Bits of intermediate state computed at various phases of extraction.
+    /// Bits of intermediate state computed at various phases of extraction.
     SetVector<BasicBlock *> Blocks;
 
     /// Lists of blocks that are branched from the code region to be extracted,
@@ -128,32 +128,32 @@ class CodeExtractorAnalysisCache {
     /// returns 1, etc.
     SmallVector<BasicBlock *> ExtractedFuncRetVals;
 
-    // Suffix to use when creating extracted function (appended to the original
-    // function name + "."). If empty, the default is to use the entry block
-    // label, if non-empty, otherwise "extracted".
+    /// Suffix to use when creating extracted function (appended to the original
+    /// function name + "."). If empty, the default is to use the entry block
+    /// label, if non-empty, otherwise "extracted".
     std::string Suffix;
 
-    // If true, the outlined function has aggregate argument in zero address
-    // space.
+    /// If true, the outlined function has aggregate argument in zero address
+    /// space.
     bool ArgsInZeroAddressSpace;
 
-    // If set, this callback will be used to allocate the arguments in the
-    // caller before passing it to the outlined function holding the extracted
-    // piece of code.
+    /// If set, this callback will be used to allocate the arguments in the
+    /// caller before passing it to the outlined function holding the extracted
+    /// piece of code.
     CustomArgAllocatorCBTy *CustomArgAllocatorCB;
 
-    // A block outside of the extraction set where previously introduced
-    // intermediate allocations can be deallocated. This is only used when an
-    // custom deallocator is specified.
+    /// A block outside of the extraction set where previously introduced
+    /// intermediate allocations can be deallocated. This is only used when a
+    /// custom deallocator is specified.
     BasicBlock *DeallocationBlock;
 
-    // If set, this callback will be used to deallocate the arguments in the
-    // caller after running the outlined function holding the extracted piece of
-    // code. It will not be called if a custom allocator isn't also present.
-    //
-    // By default, this will be done at the end of the basic block containing
-    // the call to the outlined function, except if a deallocation block is
-    // specified. In that case, that will take precedence.
+    /// If set, this callback will be used to deallocate the arguments in the
+    /// caller after running the outlined function holding the extracted piece
+    /// of code. It will not be called if a custom allocator isn't also present.
+    ///
+    /// By default, this will be done at the end of the basic block containing
+    /// the call to the outlined function, except if a deallocation block is
+    /// specified. In that case, that will take precedence.
     CustomArgDeallocatorCBTy *CustomArgDeallocatorCB;
 
   public:

llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp

@@ -281,7 +281,7 @@ computeOpenMPScheduleType(ScheduleKind ClauseKind, bool HasChunks,
 }
 
 /// Given a function, if it represents the entry point of a target kernel, this
-/// returns the execution mode flags associated to that kernel.
+/// returns the execution mode flags associated with that kernel.
 static std::optional<omp::OMPTgtExecModeFlags>
 getTargetKernelExecMode(Function &Kernel) {
   CallInst *TargetInitCall = nullptr;

llvm/lib/Transforms/Utils/CodeExtractor.cpp

@@ -275,7 +275,10 @@ CodeExtractor::CodeExtractor(ArrayRef<BasicBlock *> BBs, DominatorTree *DT,
       Suffix(Suffix), ArgsInZeroAddressSpace(ArgsInZeroAddressSpace),
       CustomArgAllocatorCB(CustomArgAllocatorCB),
       DeallocationBlock(DeallocationBlock),
-      CustomArgDeallocatorCB(CustomArgDeallocatorCB) {}
+      CustomArgDeallocatorCB(CustomArgDeallocatorCB) {
+  assert((!CustomArgDeallocatorCB || CustomArgAllocatorCB) &&
+         "custom deallocator only allowed if a custom allocator is provided");
+}
 
 /// definedInRegion - Return true if the specified value is defined in the
 /// extracted region.