aeubanks updated this revision to Diff 472053.
aeubanks added a comment.
Herald added a reviewer: shafik.
undo a lot of code added in D135169 <https://reviews.llvm.org/D135169>. it
seems a little overengineered when we can just check if the type is bool when
setting the initializer.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D137045/new/
https://reviews.llvm.org/D137045
Files:
lldb/include/lldb/Symbol/CompilerType.h
lldb/include/lldb/Symbol/TypeSystem.h
lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h
lldb/source/Symbol/CompilerType.cpp
lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py
lldb/test/API/lang/cpp/const_static_integral_member/main.cpp
Index: lldb/test/API/lang/cpp/const_static_integral_member/main.cpp
===================================================================
--- lldb/test/API/lang/cpp/const_static_integral_member/main.cpp
+++ lldb/test/API/lang/cpp/const_static_integral_member/main.cpp
@@ -5,6 +5,11 @@
enum_case2 = 2,
};
+enum EnumBool : bool {
+ enum_bool_case1 = false,
+ enum_bool_case2 = true,
+};
+
enum class ScopedEnum {
scoped_enum_case1 = 1,
scoped_enum_case2 = 2,
@@ -51,6 +56,7 @@
const static auto wchar_min = std::numeric_limits<wchar_t>::min();
const static Enum enum_val = enum_case2;
+ const static EnumBool enum_bool_val = enum_bool_case2;
const static ScopedEnum scoped_enum_val = ScopedEnum::scoped_enum_case2;
const static ScopedEnum not_enumerator_scoped_enum_val = static_cast<ScopedEnum>(5);
const static ScopedEnum not_enumerator_scoped_enum_val_2 =
Index: lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py
===================================================================
--- lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py
+++ lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py
@@ -57,6 +57,8 @@
# Test an unscoped enum.
self.expect_expr("A::enum_val", result_value="enum_case2")
+ # Test an unscoped enum with bool as the underlying type.
+ self.expect_expr("A::enum_bool_val", result_value="enum_bool_case2")
# Test a scoped enum.
self.expect_expr("A::scoped_enum_val", result_value="scoped_enum_case2")
Index: lldb/source/Symbol/CompilerType.cpp
===================================================================
--- lldb/source/Symbol/CompilerType.cpp
+++ lldb/source/Symbol/CompilerType.cpp
@@ -154,12 +154,6 @@
return IsIntegerType(is_signed) || IsEnumerationType(is_signed);
}
-bool CompilerType::IsBooleanType() const {
- if (IsValid())
- return m_type_system->IsBooleanType(m_type);
- return false;
-}
-
bool CompilerType::IsPointerType(CompilerType *pointee_type) const {
if (IsValid()) {
return m_type_system->IsPointerType(m_type, pointee_type);
Index: lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h
===================================================================
--- lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h
+++ lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h
@@ -592,8 +592,6 @@
bool IsEnumerationType(lldb::opaque_compiler_type_t type,
bool &is_signed) override;
- bool IsBooleanType(lldb::opaque_compiler_type_t type) override;
-
bool IsScopedEnumerationType(lldb::opaque_compiler_type_t type) override;
static bool IsObjCClassType(const CompilerType &type);
@@ -863,8 +861,6 @@
static void SetIntegerInitializerForVariable(clang::VarDecl *var,
const llvm::APInt &init_value);
- static void SetBoolInitializerForVariable(clang::VarDecl *var, bool value);
-
/// Initializes a variable with a floating point value.
/// \param var The variable to initialize. Must not already have an
/// initializer and must have a floating point type.
Index: lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
===================================================================
--- lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
+++ lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
@@ -3226,20 +3226,6 @@
return false;
}
-bool TypeSystemClang::IsBooleanType(lldb::opaque_compiler_type_t type) {
- if (!type)
- return false;
-
- clang::QualType qual_type(GetCanonicalQualType(type));
- const clang::BuiltinType *builtin_type =
- llvm::dyn_cast<clang::BuiltinType>(qual_type->getCanonicalTypeInternal());
-
- if (!builtin_type)
- return false;
-
- return builtin_type->isBooleanType();
-}
-
bool TypeSystemClang::IsEnumerationType(lldb::opaque_compiler_type_t type,
bool &is_signed) {
if (type) {
@@ -7593,18 +7579,6 @@
return var_decl;
}
-void TypeSystemClang::SetBoolInitializerForVariable(VarDecl *var, bool value) {
- assert(!var->hasInit() && "variable already initialized");
-
- QualType qt = var->getType();
- assert(qt->isSpecificBuiltinType(BuiltinType::Bool) &&
- "only boolean supported");
-
- clang::ASTContext &ast = var->getASTContext();
- var->setInit(CXXBoolLiteralExpr::Create(ast, value, qt.getUnqualifiedType(),
- SourceLocation()));
-}
-
void TypeSystemClang::SetIntegerInitializerForVariable(
VarDecl *var, const llvm::APInt &init_value) {
assert(!var->hasInit() && "variable already initialized");
@@ -7619,8 +7593,15 @@
const EnumDecl *enum_decl = enum_type->getDecl();
qt = enum_decl->getIntegerType();
}
- var->setInit(IntegerLiteral::Create(ast, init_value, qt.getUnqualifiedType(),
- SourceLocation()));
+ // bools are handled separately because the clang AST printer handles bools
+ // separately from other integral types.
+ if (qt->isSpecificBuiltinType(BuiltinType::Bool)) {
+ var->setInit(CXXBoolLiteralExpr::Create(
+ ast, !init_value.isZero(), qt.getUnqualifiedType(), SourceLocation()));
+ } else {
+ var->setInit(IntegerLiteral::Create(
+ ast, init_value, qt.getUnqualifiedType(), SourceLocation()));
+ }
}
void TypeSystemClang::SetFloatingInitializerForVariable(
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
@@ -2820,12 +2820,7 @@
return;
}
- if (ct.IsBooleanType())
- TypeSystemClang::SetBoolInitializerForVariable(
- v, !const_value_or_err->isZero());
- else
- TypeSystemClang::SetIntegerInitializerForVariable(v,
- *const_value_or_err);
+ TypeSystemClang::SetIntegerInitializerForVariable(v, *const_value_or_err);
}
return;
}
Index: lldb/include/lldb/Symbol/TypeSystem.h
===================================================================
--- lldb/include/lldb/Symbol/TypeSystem.h
+++ lldb/include/lldb/Symbol/TypeSystem.h
@@ -178,8 +178,6 @@
return false;
}
- virtual bool IsBooleanType(lldb::opaque_compiler_type_t type) = 0;
-
virtual bool IsScopedEnumerationType(lldb::opaque_compiler_type_t type) = 0;
virtual bool IsPossibleDynamicType(lldb::opaque_compiler_type_t type,
Index: lldb/include/lldb/Symbol/CompilerType.h
===================================================================
--- lldb/include/lldb/Symbol/CompilerType.h
+++ lldb/include/lldb/Symbol/CompilerType.h
@@ -121,8 +121,6 @@
bool IsIntegerOrEnumerationType(bool &is_signed) const;
- bool IsBooleanType() const;
-
bool IsPolymorphicClass() const;
/// \param target_type Can pass nullptr.
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
