From 849fb269fed1a0dd9e2a13e9c3103fc5a1a0b108 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Tue, 25 Aug 2015 16:25:46 +0000 Subject: [PATCH] Deprecate the DataLayout on the TargetMachine, and backport the 3.8 API to ease transition By Mehdi Amini. git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_37@245948 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/ReleaseNotes.rst | 8 ++++++++ include/llvm-c/TargetMachine.h | 2 +- include/llvm/Target/TargetMachine.h | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/ReleaseNotes.rst b/docs/ReleaseNotes.rst index d4860c9a20c..cb9d041535e 100644 --- a/docs/ReleaseNotes.rst +++ b/docs/ReleaseNotes.rst @@ -53,6 +53,14 @@ Non-comprehensive list of changes in this release a pointer to make it explicit. The Module owns the datalayout and it has to match the one attached to the TargetMachine for generating code. + In 3.6, a pass was inserted in the pipeline to make the DataLayout accessible: + MyPassManager->add(new DataLayoutPass(MyTargetMachine->getDataLayout())); + In 3.7, you don't need a pass, you set the DataLayout on the Module: + MyModule->setDataLayout(MyTargetMachine->createDataLayout()); + + The LLVM C API `LLVMGetTargetMachineData` is deprecated to reflect the fact + that it won't be available anymore from TargetMachine in 3.8. + * Comdats are now ortogonal to the linkage. LLVM will not create comdats for weak linkage globals and the frontends are responsible for explicitly adding them. diff --git a/include/llvm-c/TargetMachine.h b/include/llvm-c/TargetMachine.h index d4993e7e6da..8cf1f43cb3c 100644 --- a/include/llvm-c/TargetMachine.h +++ b/include/llvm-c/TargetMachine.h @@ -115,7 +115,7 @@ char *LLVMGetTargetMachineCPU(LLVMTargetMachineRef T); LLVMDisposeMessage. */ char *LLVMGetTargetMachineFeatureString(LLVMTargetMachineRef T); -/** Returns the llvm::DataLayout used for this llvm:TargetMachine. */ +/** Deprecated: use LLVMGetDataLayout(LLVMModuleRef M) instead. */ LLVMTargetDataRef LLVMGetTargetMachineData(LLVMTargetMachineRef T); /** Set the target machine's ASM verbosity. */ diff --git a/include/llvm/Target/TargetMachine.h b/include/llvm/Target/TargetMachine.h index 06a2b13836e..f1e9d1718f5 100644 --- a/include/llvm/Target/TargetMachine.h +++ b/include/llvm/Target/TargetMachine.h @@ -125,10 +125,15 @@ public: return *static_cast(getSubtargetImpl(F)); } + /// Deprecated in 3.7, will be removed in 3.8. Use createDataLayout() instead. + /// /// This method returns a pointer to the DataLayout for the target. It should /// be unchanging for every subtarget. const DataLayout *getDataLayout() const { return &DL; } + /// Create a DataLayout. + const DataLayout createDataLayout() const { return DL; } + /// \brief Reset the target options based on the function's attributes. // FIXME: Remove TargetOptions that affect per-function code generation // from TargetMachine. -- 2.40.0