Rebase & remove the separate type validity argument

Author: kuilpd

lldb/include/lldb/Symbol/CompilerType.h

@@ -439,7 +439,7 @@ class CompilerType {
                       uint32_t &child_bitfield_bit_size,
                       uint32_t &child_bitfield_bit_offset,
                       bool &child_is_base_class, ValueObject *valobj,
-                      uint64_t &language_flags, bool &type_valid) const;
+                      uint64_t &language_flags) const;
 
   llvm::Expected<CompilerType> GetChildCompilerTypeAtIndex(
       ExecutionContext *exe_ctx, size_t idx, bool transparent_pointers,

lldb/include/lldb/Symbol/TypeSystem.h

@@ -369,7 +369,7 @@ class TypeSystem : public PluginInterface,
       std::string &child_name, uint32_t &child_byte_size,
       int32_t &child_byte_offset, uint32_t &child_bitfield_bit_size,
       uint32_t &child_bitfield_bit_offset, bool &child_is_base_class,
-      ValueObject *valobj, uint64_t &language_flags, bool &type_valid) = 0;
+      ValueObject *valobj, uint64_t &language_flags) = 0;
 
   virtual llvm::Expected<CompilerType> GetChildCompilerTypeAtIndex(
       lldb::opaque_compiler_type_t type, ExecutionContext *exe_ctx, size_t idx,

lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp

@@ -6185,9 +6185,9 @@ llvm::Expected<CompilerType> TypeSystemClang::GetDereferencedType(
     std::string &child_name, uint32_t &child_byte_size,
     int32_t &child_byte_offset, uint32_t &child_bitfield_bit_size,
     uint32_t &child_bitfield_bit_offset, bool &child_is_base_class,
-    ValueObject *valobj, uint64_t &language_flags, bool &type_valid) {
-  type_valid = IsPointerOrReferenceType(type, nullptr) ||
-               IsArrayType(type, nullptr, nullptr, nullptr);
+    ValueObject *valobj, uint64_t &language_flags) {
+  bool type_valid = IsPointerOrReferenceType(type, nullptr) ||
+                    IsArrayType(type, nullptr, nullptr, nullptr);
   if (!type_valid)
     return llvm::createStringError("not a pointer, reference or array type");
   bool child_is_deref_of_parent;

lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h

@@ -894,7 +894,7 @@ class TypeSystemClang : public TypeSystem {
       std::string &child_name, uint32_t &child_byte_size,
       int32_t &child_byte_offset, uint32_t &child_bitfield_bit_size,
       uint32_t &child_bitfield_bit_offset, bool &child_is_base_class,
-      ValueObject *valobj, uint64_t &language_flags, bool &type_valid) override;
+      ValueObject *valobj, uint64_t &language_flags) override;
 
   llvm::Expected<CompilerType> GetChildCompilerTypeAtIndex(
       lldb::opaque_compiler_type_t type, ExecutionContext *exe_ctx, size_t idx,

lldb/source/Symbol/CompilerType.cpp

@@ -897,14 +897,14 @@ llvm::Expected<CompilerType> CompilerType::GetDereferencedType(
     ExecutionContext *exe_ctx, std::string &child_name,
     uint32_t &child_byte_size, int32_t &child_byte_offset,
     uint32_t &child_bitfield_bit_size, uint32_t &child_bitfield_bit_offset,
-    bool &child_is_base_class, ValueObject *valobj, uint64_t &language_flags,
-    bool &type_valid) const {
+    bool &child_is_base_class, ValueObject *valobj,
+    uint64_t &language_flags) const {
   if (IsValid())
     if (auto type_system_sp = GetTypeSystem())
       return type_system_sp->GetDereferencedType(
           m_type, exe_ctx, child_name, child_byte_size, child_byte_offset,
           child_bitfield_bit_size, child_bitfield_bit_offset,
-          child_is_base_class, valobj, language_flags, type_valid);
+          child_is_base_class, valobj, language_flags);
   return CompilerType();
 }
 

lldb/source/ValueObject/ValueObject.cpp

@@ -2802,29 +2802,18 @@ ValueObjectSP ValueObject::Dereference(Status &error) {
   bool child_is_base_class = false;
   CompilerType compiler_type = GetCompilerType();
   uint64_t language_flags = 0;
-  bool is_valid_dereference_type = false;
 
   ExecutionContext exe_ctx(GetExecutionContextRef());
 
   CompilerType child_compiler_type;
   auto child_compiler_type_or_err = compiler_type.GetDereferencedType(
       &exe_ctx, child_name_str, child_byte_size, child_byte_offset,
       child_bitfield_bit_size, child_bitfield_bit_offset, child_is_base_class,
-      this, language_flags, is_valid_dereference_type);
+      this, language_flags);
 
   std::string deref_error;
-  if (!child_compiler_type_or_err) {
-    auto err = child_compiler_type_or_err.takeError();
-    if (err.isA<llvm::StringError>()) {
-      deref_error = llvm::toString(std::move(err));
-      LLDB_LOG_ERROR(GetLog(LLDBLog::Types),
-                     llvm::createStringError(deref_error),
-                     "could not find child: {0}");
-    }
-  } else
+  if (child_compiler_type_or_err) {
     child_compiler_type = *child_compiler_type_or_err;
-
-  if (is_valid_dereference_type) {
     if (child_compiler_type && child_byte_size) {
       ConstString child_name;
       if (!child_name_str.empty())
@@ -2858,8 +2847,17 @@ ValueObjectSP ValueObject::Dereference(Status &error) {
         }
       }
     }
-  } else if (IsSynthetic()) {
-    m_deref_valobj = GetChildMemberWithName("$$dereference$$").get();
+  } else {
+    auto err = child_compiler_type_or_err.takeError();
+    if (err.isA<llvm::StringError>()) {
+      deref_error = llvm::toString(std::move(err));
+      LLDB_LOG_ERROR(GetLog(LLDBLog::Types),
+                     llvm::createStringError(deref_error),
+                     "could not find child: {0}");
+    }
+    if (IsSynthetic()) {
+      m_deref_valobj = GetChildMemberWithName("$$dereference$$").get();
+    }
   }
 
   if (m_deref_valobj) {

lldb/test/API/commands/frame/var-dil/basics/PointerArithmetic/TestFrameVarDILPointerArithmetic.py

@@ -33,11 +33,7 @@ def test_dereference(self):
         self.expect_var_path("*offset_pref", True, type="int *")
         self.expect_var_path("**pp_int0", value="0")
         self.expect_var_path("&**pp_int0", type="int *")
-        self.expect(
-            "frame var '*array'",
-            error=True,
-            substrs=["not a pointer or reference type"],
-        )
+        self.expect_var_path("*array", value="0")
         self.expect(
             "frame var '&*p_null'",
             error=True,