[clang] 2767f4b - [Lex] Migrate away from PointerUnion::dyn_cast (NFC) (#125380)

via cfe-commits cfe-commits at lists.llvm.org
Sun Feb 2 09:31:26 PST 2025


Author: Kazu Hirata
Date: 2025-02-02T09:31:23-08:00
New Revision: 2767f4bf0d5a70aa990dbfb3341a1bc03effcdbd

URL: https://github.com/llvm/llvm-project/commit/2767f4bf0d5a70aa990dbfb3341a1bc03effcdbd
DIFF: https://github.com/llvm/llvm-project/commit/2767f4bf0d5a70aa990dbfb3341a1bc03effcdbd.diff

LOG: [Lex] Migrate away from PointerUnion::dyn_cast (NFC) (#125380)

Note that PointerUnion::dyn_cast has been soft deprecated in
PointerUnion.h:

  // FIXME: Replace the uses of is(), get() and dyn_cast() with
  //        isa<T>, cast<T> and the llvm::dyn_cast<T>

This patch migrates the use of PointerUnion::dyn_cast to
dyn_cast_if_present because State is not guaranteed to be nonnull
elsewhere in this class.  See:

  commit 563c7c5539f05e7f8cbb42565c1f24466019f38b
  Author: Kazu Hirata <kazu at google.com>
  Date:   Sat Jan 25 14:05:01 2025 -0800

FWIW, I am not aware of any test case in check-clang that triggers
null here.

Added: 
    

Modified: 
    clang/include/clang/Lex/Preprocessor.h

Removed: 
    


################################################################################
diff  --git a/clang/include/clang/Lex/Preprocessor.h b/clang/include/clang/Lex/Preprocessor.h
index 416f403c298410c..2bf4d1a16699430 100644
--- a/clang/include/clang/Lex/Preprocessor.h
+++ b/clang/include/clang/Lex/Preprocessor.h
@@ -933,7 +933,7 @@ class Preprocessor {
     }
 
     ArrayRef<ModuleMacro*> getOverriddenMacros() const {
-      if (auto *Info = State.dyn_cast<ModuleMacroInfo*>())
+      if (auto *Info = dyn_cast_if_present<ModuleMacroInfo *>(State))
         return Info->OverriddenMacros;
       return {};
     }


        


More information about the cfe-commits mailing list