From 74db5c8c95e2aed40d288bb2df92eb859b87c827 Mon Sep 17 00:00:00 2001 From: Jeremy Morse Date: Mon, 24 Jan 2022 17:04:13 +0000 Subject: [PATCH] Revert rG6a605b97a200 due to excessive memory use Over in the comments for D116821, some use-cases have cropped up where there's a substantial increase in memory usage. A quick inspection shows that a) it's a lot of memory and b) there are several things to be done to reduce it. Reverting (via disabling this feature by default) to avoid bothering people in the meantime. --- llvm/lib/CodeGen/LiveDebugValues/LiveDebugValues.cpp | 5 ++++- llvm/test/DebugInfo/X86/instr-ref-flag.ll | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/llvm/lib/CodeGen/LiveDebugValues/LiveDebugValues.cpp b/llvm/lib/CodeGen/LiveDebugValues/LiveDebugValues.cpp index 2913506853aa40..3149729b92313d 100644 --- a/llvm/lib/CodeGen/LiveDebugValues/LiveDebugValues.cpp +++ b/llvm/lib/CodeGen/LiveDebugValues/LiveDebugValues.cpp @@ -124,10 +124,13 @@ bool LiveDebugValues::runOnMachineFunction(MachineFunction &MF) { bool llvm::debuginfoShouldUseDebugInstrRef(const Triple &T) { // Enable by default on x86_64, disable if explicitly turned off on cmdline. + // Disabled while https://reviews.llvm.org/D116821 is investigated. +#if 0 if (T.getArch() == llvm::Triple::x86_64 && ValueTrackingVariableLocations != cl::boolOrDefault::BOU_FALSE) return true; +#endif - // Otherwise: enable if explicitly requestedo n command line. + // Otherwise: enable if explicitly requested on command line. return ValueTrackingVariableLocations == cl::boolOrDefault::BOU_TRUE; } diff --git a/llvm/test/DebugInfo/X86/instr-ref-flag.ll b/llvm/test/DebugInfo/X86/instr-ref-flag.ll index f9d5f99edf77ff..56d34aedabd028 100644 --- a/llvm/test/DebugInfo/X86/instr-ref-flag.ll +++ b/llvm/test/DebugInfo/X86/instr-ref-flag.ll @@ -13,6 +13,10 @@ ;; by llc by default, and that it can be turned explicitly on or off as ;; desired. +;; Xfail due to faults found in the discussion on +;; https://reviews.llvm.org/D116821 +; XFAIL: * + ; INSTRREFON: DBG_INSTR_REF ; INSTRREFOFF: DBG_VALUE