From cc2b3e4175a6edc53487eec06da13b39eb66716b Mon Sep 17 00:00:00 2001 From: Wouter van Oortmerssen Date: Fri, 13 Nov 2020 12:24:36 -0800 Subject: [wasm64] fix for Memory64Lowering affecting DWARF data (#3348) We change the AddrSize which causes all DW_FORM_addr to be written differently. Depends on https://reviews.llvm.org/D91395 --- third_party/llvm-project/DWARFEmitter.cpp | 4 +++- third_party/llvm-project/include/llvm/ObjectYAML/DWARFYAML.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'third_party') diff --git a/third_party/llvm-project/DWARFEmitter.cpp b/third_party/llvm-project/DWARFEmitter.cpp index 6e4ee6119..aa0465d9b 100644 --- a/third_party/llvm-project/DWARFEmitter.cpp +++ b/third_party/llvm-project/DWARFEmitter.cpp @@ -190,9 +190,11 @@ protected: // XXX BINARYEN Make sure we emit the right size. We should not change the // size as we only modify relocatable fields like addresses, and such fields // have a fixed size, so any change is a bug. + // We make an exception for AddrSizeChanged, which happens when we have run + // the Memory64Lowering pass to turn wasm64 into wasm32. void onEndCompileUnit(const DWARFYAML::Unit &CU) { size_t EndPos = OS.tell(); - if (EndPos - StartPos != CU.Length.getLength()) { + if (EndPos - StartPos != CU.Length.getLength() && !CU.AddrSizeChanged) { llvm_unreachable("compile unit size was incorrect"); } } diff --git a/third_party/llvm-project/include/llvm/ObjectYAML/DWARFYAML.h b/third_party/llvm-project/include/llvm/ObjectYAML/DWARFYAML.h index 818bddede..510610123 100644 --- a/third_party/llvm-project/include/llvm/ObjectYAML/DWARFYAML.h +++ b/third_party/llvm-project/include/llvm/ObjectYAML/DWARFYAML.h @@ -128,6 +128,7 @@ struct Unit { llvm::dwarf::UnitType Type; // Added in DWARF 5 uint32_t AbbrOffset; uint8_t AddrSize; + bool AddrSizeChanged = false; // XXX BINARYEN std::vector Entries; }; -- cgit v1.2.3