From 675da70da575907f8b027531852d8e5e7ef12cec Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Mon, 25 May 2015 13:28:03 +0000 Subject: [PATCH] Refactor: Simplify boolean conditional return statements in llvm/lib/DebugInfo/DWARF Use clang-tidy to simplify boolean conditional return statements. Patch by Richard Thomson ! Differential Revision: http://reviews.llvm.org/D9972 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238132 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/DebugInfo/DWARF/DWARFFormValue.cpp | 6 ++---- lib/DebugInfo/DWARF/DWARFUnit.cpp | 5 +---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/DebugInfo/DWARF/DWARFFormValue.cpp b/lib/DebugInfo/DWARF/DWARFFormValue.cpp index 75ca7622139..53a676efaf3 100644 --- a/lib/DebugInfo/DWARF/DWARFFormValue.cpp +++ b/lib/DebugInfo/DWARF/DWARFFormValue.cpp @@ -127,10 +127,8 @@ bool DWARFFormValue::isFormClass(DWARFFormValue::FormClass FC) const { // In DWARF3 DW_FORM_data4 and DW_FORM_data8 served also as a section offset. // Don't check for DWARF version here, as some producers may still do this // by mistake. - if ((Form == DW_FORM_data4 || Form == DW_FORM_data8) && - FC == FC_SectionOffset) - return true; - return false; + return (Form == DW_FORM_data4 || Form == DW_FORM_data8) && + FC == FC_SectionOffset; } bool DWARFFormValue::extractValue(DataExtractor data, uint32_t *offset_ptr, diff --git a/lib/DebugInfo/DWARF/DWARFUnit.cpp b/lib/DebugInfo/DWARF/DWARFUnit.cpp index 63a99855551..348476d72b6 100644 --- a/lib/DebugInfo/DWARF/DWARFUnit.cpp +++ b/lib/DebugInfo/DWARF/DWARFUnit.cpp @@ -79,10 +79,7 @@ bool DWARFUnit::extractImpl(DataExtractor debug_info, uint32_t *offset_ptr) { return false; Abbrevs = Abbrev->getAbbreviationDeclarationSet(AbbrOffset); - if (Abbrevs == nullptr) - return false; - - return true; + return Abbrevs != nullptr; } bool DWARFUnit::extract(DataExtractor debug_info, uint32_t *offset_ptr) {