Index: DWARFCallFrameInfo.cpp
===================================================================
--- DWARFCallFrameInfo.cpp
+++ DWARFCallFrameInfo.cpp
@@ -461,11 +461,25 @@
       m_fde_index_initialized = true;
       return;
     }
+
+    // An FDE entry contains CIE_pointer in debug_frame in same place as cie_id
+    // in eh_frame. CIE_pointer is an “offset into the .debug_frame section”.
+    // So, variable cie_offset should be equal cie_id for debug_frame.
+    // FDE entries with cie_id == 0 shouldn’t be ignored for it.
+    if ((cie_id == 0 && m_is_eh_frame) || cie_id == UINT32_MAX || len == 0) {
+      m_cie_map[current_entry] = ParseCIE(current_entry);
+      offset = next_entry;
+      continue;
+    }
+
+    if (!m_is_eh_frame)
+      cie_offset = cie_id;
+
     if (cie_offset > m_cfi_data.GetByteSize()) {
-      Host::SystemLog(
-          Host::eSystemLogError,
-          "error: Invalid cie offset of 0x%x found in cie/fde at 0x%x\n",
-          cie_offset, current_entry);
+      Host::SystemLog(Host::eSystemLogError,
+                      "error: Invalid cie offset of 0x%x "
+                      "found in cie/fde at 0x%x\n",
+                      cie_offset, current_entry);
       // Don't trust anything in this eh_frame section if we find blatantly
       // invalid data.
       m_fde_index.Clear();
@@ -473,12 +487,6 @@
       return;
     }
 
-    if (cie_id == 0 || cie_id == UINT32_MAX || len == 0) {
-      m_cie_map[current_entry] = ParseCIE(current_entry);
-      offset = next_entry;
-      continue;
-    }
-
     const CIE *cie = GetCIE(cie_offset);
     if (cie) {
       const lldb::addr_t pc_rel_addr = m_section_sp->GetFileAddress();
@@ -531,7 +539,8 @@
     cie_offset = m_cfi_data.GetU32(&offset);
   }
 
-  assert(cie_offset != 0 && cie_offset != UINT32_MAX);
+  // FDE entries with zeroth cie_offset may occur for debug_frame.
+  assert(!(m_is_eh_frame && 0 == cie_offset) && cie_offset != UINT32_MAX);
 
   // Translate the CIE_id from the eh_frame format, which
   // is relative to the FDE offset, into a __eh_frame section
Index: UnwindTable.cpp
===================================================================
--- UnwindTable.cpp
+++ UnwindTable.cpp
@@ -51,6 +51,13 @@
     if (sect.get()) {
       m_eh_frame_up.reset(new DWARFCallFrameInfo(m_object_file, sect,
                                                  eRegisterKindEHFrame, true));
+    } else {
+      // Try to find .debug_frame section even if .eh_frame doesn't exist.
+      sect = sl->FindSectionByType(eSectionTypeDWARFDebugFrame, true);
+      if (sect.get()) {
+        m_eh_frame_up.reset(new DWARFCallFrameInfo(m_object_file, sect,
+                                                   eRegisterKindDWARF, false));
+      }
     }
     sect = sl->FindSectionByType(eSectionTypeCompactUnwind, true);
     if (sect.get()) {