[llvm] r305343 - Reverted r305339 as MSVC is not happy with noreturn in lambda.

Galina Kistanova via llvm-commits llvm-commits at lists.llvm.org
Tue Jun 13 16:57:51 PDT 2017


Author: gkistanova
Date: Tue Jun 13 18:57:51 2017
New Revision: 305343

URL: http://llvm.org/viewvc/llvm-project?rev=305343&view=rev
Log:
Reverted r305339 as MSVC is not happy with noreturn in lambda.

Modified:
    llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp

Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp?rev=305343&r1=305342&r2=305343&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp (original)
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp Tue Jun 13 18:57:51 2017
@@ -521,7 +521,7 @@ void DWARFDebugFrame::parse(DataExtracto
   while (Data.isValidOffset(Offset)) {
     uint32_t StartOffset = Offset;
 
-    auto ReportError = [StartOffset](const char *ErrorMsg) LLVM_ATTRIBUTE_NORETURN {
+    auto ReportError = [StartOffset](const char *ErrorMsg) {
       std::string Str;
       raw_string_ostream OS(Str);
       OS << format(ErrorMsg, StartOffset);
@@ -585,6 +585,7 @@ void DWARFDebugFrame::parse(DataExtracto
           switch (AugmentationString[i]) {
             default:
               ReportError("Unknown augmentation character in entry at %lx");
+              llvm_unreachable("ReportError should not return.");
             case 'L':
               LSDAPointerEncoding = Data.getU8(&Offset);
               break;




More information about the llvm-commits mailing list