Merge pull request #5857 from augusto2112/variable-metadata-cast

[lldb][NFC] Change casting of VariableMetadata to use llvm's standard

Author: augusto2112

lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.cpp

@@ -73,10 +73,10 @@ void SwiftASTManipulatorBase::VariableInfo::Print(
   else
     stream.PutCString("<no type>");
 
-  if (MetadataIs<VariableMetadataResult>())
+  if (llvm::isa<VariableMetadataResult>(m_metadata.get()))
     stream.Printf(", is_result");
 
-  if (MetadataIs<VariableMetadataError>())
+  if (llvm::isa<VariableMetadataError>(m_metadata.get()))
     stream.Printf(", is_error");
 
   stream.PutChar(']');

lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.h

@@ -20,6 +20,8 @@
 #include "swift/AST/Decl.h"
 #include "swift/Basic/SourceLoc.h"
 #include "llvm/ADT/SmallVector.h"
+#include "llvm/Support/Casting.h"
+
 
 namespace swift {
 class CaseStmt;
@@ -38,25 +40,31 @@ class SwiftASTManipulatorBase {
 public:
   class VariableMetadata {
   public:
-    VariableMetadata() {}
-    virtual ~VariableMetadata() {}
-    virtual unsigned GetType() = 0;
+    VariableMetadata() = default;
+    virtual ~VariableMetadata() = default;
+    virtual unsigned GetType() const = 0;
   };
 
   class VariableMetadataResult
       : public SwiftASTManipulatorBase::VariableMetadata {
   public:
     virtual ~VariableMetadataResult();
     constexpr static unsigned Type() { return 'Resu'; }
-    unsigned GetType() override { return Type(); }
+    unsigned GetType() const override { return Type(); }
+    static bool classof(const VariableMetadata *VM) {
+      return VM->GetType() == Type();
+    }
   };
 
   class VariableMetadataError
       : public SwiftASTManipulatorBase::VariableMetadata {
   public:
     virtual ~VariableMetadataError();
     constexpr static unsigned Type() { return 'Erro'; }
-    unsigned GetType() override { return Type(); }
+    unsigned GetType() const override { return Type(); }
+    static bool classof(const VariableMetadata *VM) {
+      return VM->GetType() == Type();
+    }
   };
 
   class VariableMetadataPersistent
@@ -67,7 +75,10 @@ class SwiftASTManipulatorBase {
         : m_persistent_variable_sp(persistent_variable_sp) {}
 
     static constexpr unsigned Type() { return 'Pers'; }
-    unsigned GetType() override { return Type(); }
+    unsigned GetType() const override { return Type(); }
+    static bool classof(const VariableMetadata *VM) {
+      return VM->GetType() == Type();
+    }
     lldb::ExpressionVariableSP m_persistent_variable_sp;
   };
 
@@ -78,7 +89,10 @@ class SwiftASTManipulatorBase {
         : m_variable_sp(variable_sp) {}
 
     static constexpr unsigned Type() { return 'Vari'; }
-    unsigned GetType() override { return Type(); }
+    unsigned GetType() const override { return Type(); }
+    static bool classof(const VariableMetadata *VM) {
+      return VM->GetType() == Type();
+    }
     lldb::VariableSP m_variable_sp;
   };
 
@@ -107,10 +121,6 @@ class SwiftASTManipulatorBase {
         : m_type(type), m_name(name), m_var_introducer(introducer),
           m_is_capture_list(is_capture_list), m_metadata(metadata) {}
 
-    template <class T> bool MetadataIs() const {
-      return (m_metadata && m_metadata->GetType() == T::Type());
-    }
-
     void Print(Stream &stream) const;
 
     void SetType(CompilerType new_type) { m_type = new_type; }

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

@@ -833,10 +833,10 @@ MaterializeVariable(SwiftASTManipulatorBase::VariableInfo &variable,
   uint64_t offset = 0;
   bool needs_init = false;
 
-  bool is_result =
-      variable.MetadataIs<SwiftASTManipulatorBase::VariableMetadataResult>();
-  bool is_error =
-      variable.MetadataIs<SwiftASTManipulatorBase::VariableMetadataError>();
+  bool is_result = llvm::isa<SwiftASTManipulatorBase::VariableMetadataResult>(
+      variable.m_metadata.get());
+  bool is_error = llvm::isa<SwiftASTManipulatorBase::VariableMetadataError>(
+      variable.m_metadata.get());
 
   auto compiler_type = variable.GetType();
   // Add the persistent variable as a typeref compiler type.
@@ -910,14 +910,11 @@ MaterializeVariable(SwiftASTManipulatorBase::VariableInfo &variable,
     if (log)
       log->Printf("Added %s variable to struct at offset %llu",
                   is_result ? "result" : "error", (unsigned long long)offset);
-  } else if (variable.MetadataIs<
-                 SwiftASTManipulatorBase::VariableMetadataVariable>()) {
+  } else if (auto *variable_metadata = llvm::dyn_cast<
+                 SwiftASTManipulatorBase::VariableMetadataVariable>(
+                 variable.m_metadata.get())) {
     Status error;
 
-    SwiftASTManipulatorBase::VariableMetadataVariable *variable_metadata =
-        static_cast<SwiftASTManipulatorBase::VariableMetadataVariable *>(
-            variable.m_metadata.get());
-
     offset = materializer.AddVariable(variable_metadata->m_variable_sp, error);
 
     if (!error.Success()) {
@@ -931,12 +928,9 @@ MaterializeVariable(SwiftASTManipulatorBase::VariableInfo &variable,
       log->Printf("Added variable %s to struct at offset %llu",
                   variable_metadata->m_variable_sp->GetName().AsCString(),
                   (unsigned long long)offset);
-  } else if (variable.MetadataIs<
-                 SwiftASTManipulatorBase::VariableMetadataPersistent>()) {
-    SwiftASTManipulatorBase::VariableMetadataPersistent *variable_metadata =
-        static_cast<SwiftASTManipulatorBase::VariableMetadataPersistent *>(
-            variable.m_metadata.get());
-
+  } else if (auto *variable_metadata = llvm::dyn_cast<
+                 SwiftASTManipulatorBase::VariableMetadataPersistent>(
+                 variable.m_metadata.get())) {
     needs_init = llvm::cast<SwiftExpressionVariable>(
                      variable_metadata->m_persistent_variable_sp.get())
                      ->m_swift_flags &