diff options
author | Stephen Tozer <stephen.tozer@sony.com> | 2024-06-11 15:14:21 +0100 |
---|---|---|
committer | Stephen Tozer <stephen.tozer@sony.com> | 2024-06-11 15:14:31 +0100 |
commit | d83f37f039dbd96918feb94c441882f71d772e55 (patch) | |
tree | c987fea40517d6825dc0071059b1f12b1f3b0366 /mlir | |
parent | 2eb60e2de812187839954d2ce35e1479817631db (diff) | |
download | llvm-d83f37f039dbd96918feb94c441882f71d772e55.zip llvm-d83f37f039dbd96918feb94c441882f71d772e55.tar.gz llvm-d83f37f039dbd96918feb94c441882f71d772e55.tar.bz2 |
Revert#2 "[MLIR][Flang][DebugInfo] Set debug info format in MLIR->IR translation (#95098)"
Also reverts "[MLIR][Flang][DebugInfo] Convert debug format in MLIR translators"
The patch above introduces behaviour controlled by an LLVM flag into the
Flang driver, which is incorrect behaviour.
This reverts commits:
3cc2710e0dd53bb82742904fa13014018a1137ed.
460408f78b30720950040e336f7b566aa7203269.
Diffstat (limited to 'mlir')
-rw-r--r-- | mlir/lib/Target/LLVMIR/ConvertToLLVMIR.cpp | 10 | ||||
-rw-r--r-- | mlir/lib/Target/LLVMIR/ModuleTranslation.cpp | 10 | ||||
-rw-r--r-- | mlir/test/lib/Dialect/Test/TestToLLVMIRTranslation.cpp | 10 |
3 files changed, 0 insertions, 30 deletions
diff --git a/mlir/lib/Target/LLVMIR/ConvertToLLVMIR.cpp b/mlir/lib/Target/LLVMIR/ConvertToLLVMIR.cpp index be3b36c..4558893 100644 --- a/mlir/lib/Target/LLVMIR/ConvertToLLVMIR.cpp +++ b/mlir/lib/Target/LLVMIR/ConvertToLLVMIR.cpp @@ -16,12 +16,9 @@ #include "mlir/Target/LLVMIR/Dialect/All.h" #include "mlir/Target/LLVMIR/Export.h" #include "mlir/Tools/mlir-translate/Translation.h" -#include "llvm/IR/DebugProgramInstruction.h" #include "llvm/IR/LLVMContext.h" #include "llvm/IR/Module.h" -extern llvm::cl::opt<bool> WriteNewDbgInfoFormat; - using namespace mlir; namespace mlir { @@ -34,13 +31,6 @@ void registerToLLVMIRTranslation() { if (!llvmModule) return failure(); - // When printing LLVM IR, we should convert the module to the debug info - // format that LLVM expects us to print. - // See https://llvm.org/docs/RemoveDIsDebugInfo.html - llvm::ScopedDbgInfoFormatSetter FormatSetter(*llvmModule, - WriteNewDbgInfoFormat); - if (WriteNewDbgInfoFormat) - llvmModule->removeDebugIntrinsicDeclarations(); llvmModule->print(output, nullptr); return success(); }, diff --git a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp index e1a60f1..7b86b25 100644 --- a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp +++ b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp @@ -64,8 +64,6 @@ using namespace mlir; using namespace mlir::LLVM; using namespace mlir::LLVM::detail; -extern llvm::cl::opt<bool> UseNewDbgInfoFormat; - #include "mlir/Dialect/LLVMIR/LLVMConversionEnumsToLLVM.inc" namespace { @@ -1791,9 +1789,6 @@ prepareLLVMModule(Operation *m, llvm::LLVMContext &llvmContext, StringRef name) { m->getContext()->getOrLoadDialect<LLVM::LLVMDialect>(); auto llvmModule = std::make_unique<llvm::Module>(name, llvmContext); - // ModuleTranslation can currently only construct modules in the old debug - // info format, so set the flag accordingly. - llvmModule->setNewDbgInfoFormatFlag(false); if (auto dataLayoutAttr = m->getDiscardableAttr(LLVM::LLVMDialect::getDataLayoutAttrName())) { llvmModule->setDataLayout(cast<StringAttr>(dataLayoutAttr).getValue()); @@ -1872,11 +1867,6 @@ mlir::translateModuleToLLVMIR(Operation *module, llvm::LLVMContext &llvmContext, if (failed(translator.convertFunctions())) return nullptr; - // Once we've finished constructing elements in the module, we should convert - // it to use the debug info format desired by LLVM. - // See https://llvm.org/docs/RemoveDIsDebugInfo.html - translator.llvmModule->setIsNewDbgInfoFormat(UseNewDbgInfoFormat); - if (!disableVerification && llvm::verifyModule(*translator.llvmModule, &llvm::errs())) return nullptr; diff --git a/mlir/test/lib/Dialect/Test/TestToLLVMIRTranslation.cpp b/mlir/test/lib/Dialect/Test/TestToLLVMIRTranslation.cpp index 813b496..57e7d65 100644 --- a/mlir/test/lib/Dialect/Test/TestToLLVMIRTranslation.cpp +++ b/mlir/test/lib/Dialect/Test/TestToLLVMIRTranslation.cpp @@ -22,9 +22,6 @@ #include "mlir/Tools/mlir-translate/Translation.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/ADT/TypeSwitch.h" -#include "llvm/IR/DebugProgramInstruction.h" - -extern llvm::cl::opt<bool> WriteNewDbgInfoFormat; using namespace mlir; @@ -125,13 +122,6 @@ void registerTestToLLVMIR() { if (!llvmModule) return failure(); - // When printing LLVM IR, we should convert the module to the debug info - // format that LLVM expects us to print. - // See https://llvm.org/docs/RemoveDIsDebugInfo.html - llvm::ScopedDbgInfoFormatSetter FormatSetter(*llvmModule, - WriteNewDbgInfoFormat); - if (WriteNewDbgInfoFormat) - llvmModule->removeDebugIntrinsicDeclarations(); llvmModule->print(output, nullptr); return success(); }, |