[llvm] r289017 - Unbreak buildbots where the debug info test was crashing due to unchecked error.

[Greg Clayton via llvm-commits]

The builder you mentioned was a separate issue and it was a double free that was fixed with:

r289070 | gclayton | 2016-12-08 08:57:04 -0800 (Thu, 08 Dec 2016) | 5 lines

Fix ASAN buildbots by fixing a double free crash.

The dwarfgen::Generator::StringPool was in a unique_ptr but it was owned by the Allocator member variable so it was being free twice.



> On Dec 8, 2016, at 12:20 PM, Vitaly Buka <vitalybuka at google.com> wrote:
> 
> This patch is likely the reason for http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/1229/steps/check-llvm%20asan/logs/stdio
> 
> On Wed, Dec 7, 2016 at 6:21 PM Greg Clayton via llvm-commits <llvm-commits at lists.llvm.org> wrote:
> Author: gclayton
> Date: Wed Dec  7 20:11:03 2016
> New Revision: 289017
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=289017&view=rev
> Log:
> Unbreak buildbots where the debug info test was crashing due to unchecked error.
> 
> 
> Modified:
>     llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
> 
> Modified: llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp?rev=289017&r1=289016&r2=289017&view=diff
> ==============================================================================
> --- llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp (original)
> +++ llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp Wed Dec  7 20:11:03 2016
> @@ -51,14 +51,15 @@ Triple getHostTripleForAddrSize(uint8_t
>  /// \returns true if there were errors, false otherwise.
>  template <typename T>
>  static bool HandleExpectedError(T &Expected) {
> -  if (!Expected)
> -    return false;
>    std::string ErrorMsg;
>    handleAllErrors(Expected.takeError(), [&](const llvm::ErrorInfoBase &EI) {
>      ErrorMsg = EI.message();
>    });
> -  ::testing::AssertionFailure() << "error: " << ErrorMsg;
> -  return true;
> +  if (!ErrorMsg.empty()) {
> +    ::testing::AssertionFailure() << "error: " << ErrorMsg;
> +    return true;
> +  }
> +  return false;
>  }
> 
>  template <uint16_t Version, class AddrType, class RefAddrType>
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits