Skip to content

Commit

Permalink
Fix integer literals which are cast to bool
Browse files Browse the repository at this point in the history
This change replaces built-in types that are implicitly converted to
booleans.

Differential revision: https://reviews.llvm.org/D62284

llvm-svn: 361580
  • Loading branch information
JDevlieghere committed May 24, 2019
1 parent 060f4b4 commit 09ad8c8
Showing 34 changed files with 84 additions and 82 deletions.
2 changes: 1 addition & 1 deletion lldb/source/Commands/CommandObjectPlatform.cpp
Original file line number Diff line number Diff line change
@@ -235,7 +235,7 @@ class CommandObjectPlatformList : public CommandObjectParsed {
host_platform_sp->GetDescription());

uint32_t idx;
for (idx = 0; 1; ++idx) {
for (idx = 0; true; ++idx) {
const char *plugin_name =
PluginManager::GetPlatformPluginNameAtIndex(idx);
if (plugin_name == nullptr)
2 changes: 1 addition & 1 deletion lldb/source/Commands/CommandObjectTarget.cpp
Original file line number Diff line number Diff line change
@@ -3740,7 +3740,7 @@ class CommandObjectTargetModulesLookup : public CommandObjectParsed {
break;

case 'v':
m_verbose = 1;
m_verbose = true;
break;

case 'A':
2 changes: 1 addition & 1 deletion lldb/source/Commands/CommandObjectThread.cpp
Original file line number Diff line number Diff line change
@@ -482,7 +482,7 @@ class CommandObjectThreadStepWithTypeAndScope : public CommandObjectParsed {

case 'e':
if (option_arg == "block") {
m_end_line_is_block_end = 1;
m_end_line_is_block_end = true;
break;
}
if (option_arg.getAsInteger(0, m_end_line))
2 changes: 1 addition & 1 deletion lldb/source/Core/Address.cpp
Original file line number Diff line number Diff line change
@@ -161,7 +161,7 @@ static bool ReadAddress(ExecutionContextScope *exe_scope,
static bool DumpUInt(ExecutionContextScope *exe_scope, const Address &address,
uint32_t byte_size, Stream *strm) {
if (exe_scope == nullptr || byte_size == 0)
return 0;
return false;
std::vector<uint8_t> buf(byte_size, 0);

if (ReadBytes(exe_scope, address, &buf[0], buf.size()) == buf.size()) {
2 changes: 1 addition & 1 deletion lldb/source/Host/macosx/objcxx/Host.mm
Original file line number Diff line number Diff line change
@@ -547,7 +547,7 @@ DataExtractor data(arg_data.GetBytes(), arg_data_size,
match_info_ptr->GetNameMatchType(),
match_info_ptr->GetProcessInfo().GetName())) {
// Skip NULLs
while (1) {
while (true) {
const uint8_t *p = data.PeekData(offset, 1);
if ((p == NULL) || (*p != '\0'))
break;
6 changes: 3 additions & 3 deletions lldb/source/Interpreter/Options.cpp
Original file line number Diff line number Diff line change
@@ -1007,7 +1007,7 @@ llvm::Expected<Args> Options::ParseAlias(const Args &args,
std::unique_lock<std::mutex> lock;
OptionParser::Prepare(lock);
int val;
while (1) {
while (true) {
int long_options_index = -1;
val = OptionParser::Parse(argv.size(), &*argv.begin(), sstr.GetString(),
long_options, &long_options_index);
@@ -1160,7 +1160,7 @@ OptionElementVector Options::ParseForCompletion(const Args &args,
bool failed_once = false;
uint32_t dash_dash_pos = -1;

while (1) {
while (true) {
bool missing_argument = false;
int long_options_index = -1;

@@ -1358,7 +1358,7 @@ llvm::Expected<Args> Options::Parse(const Args &args,
std::unique_lock<std::mutex> lock;
OptionParser::Prepare(lock);
int val;
while (1) {
while (true) {
int long_options_index = -1;
val = OptionParser::Parse(argv.size(), &*argv.begin(), sstr.GetString(),
long_options, &long_options_index);
30 changes: 15 additions & 15 deletions lldb/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.cpp
Original file line number Diff line number Diff line change
@@ -917,15 +917,15 @@ ValueObjectSP ABISysV_mips64::GetReturnValueObjectImpl(
uint32_t integer_bytes = 0;

// True if return values are in FP return registers.
bool use_fp_regs = 0;
bool use_fp_regs = false;
// True if we found any non floating point field in structure.
bool found_non_fp_field = 0;
bool found_non_fp_field = false;
// True if return values are in r2 register.
bool use_r2 = 0;
bool use_r2 = false;
// True if return values are in r3 register.
bool use_r3 = 0;
bool use_r3 = false;
// True if the result is copied into our data buffer
bool sucess = 0;
bool sucess = false;
std::string name;
bool is_complex;
uint32_t count;
@@ -943,9 +943,9 @@ ValueObjectSP ABISysV_mips64::GetReturnValueObjectImpl(
nullptr, nullptr);

if (field_compiler_type.IsFloatingPointType(count, is_complex))
use_fp_regs = 1;
use_fp_regs = true;
else
found_non_fp_field = 1;
found_non_fp_field = true;
}

if (use_fp_regs && !found_non_fp_field) {
@@ -1059,20 +1059,20 @@ ValueObjectSP ABISysV_mips64::GetReturnValueObjectImpl(
// structure
integer_bytes = integer_bytes + *field_byte_width +
padding; // Increase the consumed bytes.
use_r2 = 1;
use_r2 = true;
} else {
// There isn't enough space left in r2 for this field, so this
// will be in r3.
integer_bytes = integer_bytes + *field_byte_width +
padding; // Increase the consumed bytes.
use_r3 = 1;
use_r3 = true;
}
}
// We already have consumed at-least 8 bytes that means r2 is done,
// and this field will be in r3. Check if this field can fit in r3.
else if (integer_bytes + *field_byte_width + padding <= 16) {
integer_bytes = integer_bytes + *field_byte_width + padding;
use_r3 = 1;
use_r3 = true;
} else {
// There isn't any space left for this field, this should not
// happen as we have already checked the overall size is not
@@ -1085,10 +1085,10 @@ ValueObjectSP ABISysV_mips64::GetReturnValueObjectImpl(
// Vector types up to 16 bytes are returned in GP return registers
if (type_flags & eTypeIsVector) {
if (*byte_size <= 8)
use_r2 = 1;
use_r2 = true;
else {
use_r2 = 1;
use_r3 = 1;
use_r2 = true;
use_r3 = true;
}
}

@@ -1100,7 +1100,7 @@ ValueObjectSP ABISysV_mips64::GetReturnValueObjectImpl(
error);
if (bytes_copied != r2_info->byte_size)
return return_valobj_sp;
sucess = 1;
sucess = true;
}
if (use_r3) {
reg_ctx->ReadRegister(r3_info, r3_value);
@@ -1110,7 +1110,7 @@ ValueObjectSP ABISysV_mips64::GetReturnValueObjectImpl(

if (bytes_copied != r3_info->byte_size)
return return_valobj_sp;
sucess = 1;
sucess = true;
}
if (sucess) {
// The result is in our data buffer. Create a variable object out of
Original file line number Diff line number Diff line change
@@ -239,7 +239,7 @@ bool ASTResultSynthesizer::SynthesizeBodyResult(CompoundStmt *Body,
break;

last_expr = implicit_cast->getSubExpr();
} while (0);
} while (false);

// is_lvalue is used to record whether the expression returns an assignable
// Lvalue or an Rvalue. This is relevant because they are handled
30 changes: 16 additions & 14 deletions lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp
Original file line number Diff line number Diff line change
@@ -101,7 +101,7 @@ void ClangASTSource::InstallASTContext(clang::ASTContext &ast_context,
break;

sources.push_back(runtime_decl_vendor->GetImporterSource());
} while (0);
} while (false);

do {
DeclVendor *modules_decl_vendor =
@@ -111,7 +111,7 @@ void ClangASTSource::InstallASTContext(clang::ASTContext &ast_context,
break;

sources.push_back(modules_decl_vendor->GetImporterSource());
} while (0);
} while (false);

if (!is_shared_context) {
// Update the scratch AST context's merger to reflect any new sources we
@@ -125,7 +125,9 @@ void ClangASTSource::InstallASTContext(clang::ASTContext &ast_context,
sources.push_back({*scratch_ast_context->getASTContext(),
*scratch_ast_context->getFileManager(),
scratch_ast_context->GetOriginMap()});
} while (0);
}
while (false)
;

m_merger_up =
llvm::make_unique<clang::ExternalASTMerger>(target, sources);
@@ -934,7 +936,7 @@ void ClangASTSource::FindExternalVisibleDecls(
context.m_found.type = true;
}
}
} while (0);
} while (false);
}

if (!context.m_found.type) {
@@ -985,10 +987,10 @@ void ClangASTSource::FindExternalVisibleDecls(
}

context.AddNamedDecl(copied_named_decl);
} while (0);
} while (false);
}

} while (0);
} while (false);
}

template <class D> class TaggedASTDecl {
@@ -1173,7 +1175,7 @@ void ClangASTSource::FindObjCMethodDecls(NameSearchContext &context) {
if (FindObjCMethodDeclsWithOrigin(current_id, context,
original_interface_decl, "at origin"))
return; // found it, no need to look any further
} while (0);
} while (false);

StreamString ss;

@@ -1278,7 +1280,7 @@ void ClangASTSource::FindObjCMethodDecls(NameSearchContext &context) {
if (*cursor == ' ' || *cursor == '(')
sc_list.Append(candidate_sc);
}
} while (0);
} while (false);

if (sc_list.GetSize()) {
// We found a good function symbol. Use that.
@@ -1361,7 +1363,7 @@ void ClangASTSource::FindObjCMethodDecls(NameSearchContext &context) {
"in debug info");

return;
} while (0);
} while (false);

do {
// Check the modules only if the debug information didn't have a complete
@@ -1388,7 +1390,7 @@ void ClangASTSource::FindObjCMethodDecls(NameSearchContext &context) {
current_id, context, interface_decl_from_modules, "in modules"))
return;
}
} while (0);
} while (false);

do {
// Check the runtime only if the debug information didn't have a complete
@@ -1425,7 +1427,7 @@ void ClangASTSource::FindObjCMethodDecls(NameSearchContext &context) {

FindObjCMethodDeclsWithOrigin(current_id, context, runtime_interface_decl,
"in runtime");
} while (0);
} while (false);
}

static bool FindObjCPropertyAndIvarDeclsWithOrigin(
@@ -1544,7 +1546,7 @@ void ClangASTSource::FindObjCPropertyAndIvarDecls(NameSearchContext &context) {
complete_iface_decl);

return;
} while (0);
} while (false);

do {
// Check the modules only if the debug information didn't have a complete
@@ -1580,7 +1582,7 @@ void ClangASTSource::FindObjCPropertyAndIvarDecls(NameSearchContext &context) {
if (FindObjCPropertyAndIvarDeclsWithOrigin(current_id, context, *this,
interface_decl_from_modules))
return;
} while (0);
} while (false);

do {
// Check the runtime only if the debug information didn't have a complete
@@ -1625,7 +1627,7 @@ void ClangASTSource::FindObjCPropertyAndIvarDecls(NameSearchContext &context) {
if (FindObjCPropertyAndIvarDeclsWithOrigin(
current_id, context, *this, interface_decl_from_runtime))
return;
} while (0);
} while (false);
}

typedef llvm::DenseMap<const FieldDecl *, uint64_t> FieldOffsetMap;
Original file line number Diff line number Diff line change
@@ -927,7 +927,7 @@ void ClangExpressionDeclMap::FindExternalVisibleDecls(
name.GetCString());

context.AddNamedDecl(parser_named_decl);
} while (0);
} while (false);
}

if (name.GetCString()[0] == '$' && !namespace_decl) {
@@ -1562,7 +1562,7 @@ void ClangExpressionDeclMap::FindExternalVisibleDecls(
context.m_found.variable = true;
}
}
} while (0);
} while (false);
}

if (target && !context.m_found.variable && !namespace_decl) {
Original file line number Diff line number Diff line change
@@ -657,10 +657,10 @@ bool EmulateInstructionARM64::EmulateADDSUBImm(const uint32_t opcode) {

if (sub_op) {
operand2 = NOT(operand2);
carry_in = 1;
carry_in = true;
imm = -imm; // For the Register plug offset context below
} else {
carry_in = 0;
carry_in = false;
}

ProcState proc_state;
Original file line number Diff line number Diff line change
@@ -334,9 +334,9 @@ bool ClassDescriptorV2::Describe(
std::unique_ptr<class_rw_t> class_rw;

if (!Read_objc_class(process, objc_class))
return 0;
return false;
if (!Read_class_row(process, *objc_class, class_ro, class_rw))
return 0;
return false;

static ConstString NSObject_name("NSObject");

Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ class lldb_private::AppleObjCExternalASTSource
non_const_interface_decl->lookup(name);

return (result.size() != 0);
} while (0);
} while (false);

SetNoExternalVisibleDeclsForName(decl_ctx, name);
return false;
@@ -208,7 +208,7 @@ class ObjCRuntimeMethodType {

uint32_t stepsLeft = 256;

while (1) {
while (true) {
if (--stepsLeft == 0) {
m_is_valid = false;
return;
@@ -647,7 +647,7 @@ AppleObjCDeclVendor::FindDecls(ConstString name, bool append,
decls.push_back(iface_decl);
ret++;
break;
} while (0);
} while (false);

return ret;
}
2 changes: 1 addition & 1 deletion lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
Original file line number Diff line number Diff line change
@@ -5038,7 +5038,7 @@ ObjectFileMachO::GetArchitecture(const llvm::MachO::mach_header &header,
triple.setEnvironmentName(os_env.environment);
return arch;
}
} while (0);
} while (false);
offset = cmd_offset + load_cmd.cmdsize;
}

Original file line number Diff line number Diff line change
@@ -87,7 +87,7 @@ bool CommunicationKDP::SendRequestAndGetReply(
for (uint32_t i = 0; i < num_retries; ++i) {
if (SendRequestPacketNoLock(request_packet)) {
const uint8_t request_sequence_id = (uint8_t)request_packet.GetData()[1];
while (1) {
while (true) {
if (WaitForPacketWithTimeoutMicroSecondsNoLock(
reply_packet,
std::chrono::microseconds(GetPacketTimeout()).count())) {
4 changes: 2 additions & 2 deletions lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
Original file line number Diff line number Diff line change
@@ -2664,7 +2664,7 @@ bool DWARFASTParserClang::ParseChildMembers(
DelayedPropertyList &delayed_properties, AccessType &default_accessibility,
bool &is_a_class, ClangASTImporter::LayoutInfo &layout_info) {
if (!parent_die)
return 0;
return false;

// Get the parent byte size so we can verify any members will fit
const uint64_t parent_byte_size =
@@ -2679,7 +2679,7 @@ bool DWARFASTParserClang::ParseChildMembers(
ClangASTContext *ast =
llvm::dyn_cast_or_null<ClangASTContext>(class_clang_type.GetTypeSystem());
if (ast == nullptr)
return 0;
return false;

for (DWARFDIE die = parent_die.GetFirstChild(); die.IsValid();
die = die.GetSibling()) {
Loading

0 comments on commit 09ad8c8

Please sign in to comment.