Fixups

Author: MacDue

llvm/include/llvm/CodeGen/TargetLowering.h

@@ -4686,7 +4686,7 @@ class LLVM_ABI TargetLowering : public TargetLoweringBase {
     llvm_unreachable("Not Implemented");
   }
 
-  /// Optional target hook at add target-specific actions when entering EH pad
+  /// Optional target hook to add target-specific actions when entering EH pad
   /// blocks. The implementation should return the resulting token chain value.
   virtual SDValue lowerEHPadEntry(SDValue Chain, const SDLoc &DL,
                                   SelectionDAG &DAG) const {

llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

@@ -1734,11 +1734,10 @@ void SelectionDAGISel::SelectAllBasicBlocks(const Function &Fn) {
         continue;
 
       if (!FastIS) {
-        if (SDValue NewRoot = TLI->lowerEHPadEntry(CurDAG->getRoot(),
-                                                   SDB->getCurSDLoc(), *CurDAG);
-            NewRoot && NewRoot != CurDAG->getRoot()) {
+        SDValue NewRoot = TLI->lowerEHPadEntry(CurDAG->getRoot(),
+                                               SDB->getCurSDLoc(), *CurDAG);
+        if (NewRoot && NewRoot != CurDAG->getRoot())
           CurDAG->setRoot(NewRoot);
-        }
       }
     }
 

llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

@@ -7926,7 +7926,7 @@ SDValue AArch64TargetLowering::lowerEHPadEntry(SDValue Chain, SDLoc const &DL,
   // Therefore, if the function that contains this exception handler is a
   // streaming[-compatible] function, we must re-enable streaming mode.
   //
-  // These mode changes are usually optimized away in catch blocks (as they)
+  // These mode changes are usually optimized away in catch blocks as they
   // occur before the __cxa_begin_catch (which is a non-streaming function),
   // but are necessary in some cases (such as for cleanups).